diff --git a/src/akonadi/akonadicontextrepository.cpp b/src/akonadi/akonadicontextrepository.cpp
--- a/src/akonadi/akonadicontextrepository.cpp
+++ b/src/akonadi/akonadicontextrepository.cpp
@@ -74,7 +74,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
         auto tag = m_serializer->createTagFromContext(parent);
         Q_ASSERT(tag.isValid());
         childItem.setTag(tag);
@@ -100,7 +100,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
         auto tag = m_serializer->createTagFromContext(parent);
         Q_ASSERT(tag.isValid());
         childItem.clearTag(tag);
@@ -126,7 +126,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
         childItem.clearTags();
 
         auto updateJob = m_storage->updateItem(childItem);
diff --git a/src/akonadi/akonadilivequeryhelpers.cpp b/src/akonadi/akonadilivequeryhelpers.cpp
--- a/src/akonadi/akonadilivequeryhelpers.cpp
+++ b/src/akonadi/akonadilivequeryhelpers.cpp
@@ -176,7 +176,7 @@
                 return;
 
             Q_ASSERT(job->items().size() == 1);
-            auto item = job->items()[0];
+            auto item = job->items().at(0);
             Q_ASSERT(item.parentCollection().isValid());
             auto job = storage->fetchItems(item.parentCollection());
             Utils::JobHandler::install(job->kjob(), [job, add] {
diff --git a/src/akonadi/akonadiprojectrepository.cpp b/src/akonadi/akonadiprojectrepository.cpp
--- a/src/akonadi/akonadiprojectrepository.cpp
+++ b/src/akonadi/akonadiprojectrepository.cpp
@@ -76,7 +76,7 @@
            return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
         m_serializer->updateItemProject(childItem, parent);
 
         // Check collections to know if we need to move child
@@ -87,7 +87,7 @@
                 return;
 
             Q_ASSERT(fetchParentItemJob->items().size() == 1);
-            auto parentItem = fetchParentItemJob->items().first();
+            auto parentItem = fetchParentItemJob->items().at(0);
 
             const int itemCollectionId = childItem.parentCollection().id();
             const int parentCollectionId = parentItem.parentCollection().id();
@@ -136,7 +136,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
 
         m_serializer->removeItemParent(childItem);
 
diff --git a/src/akonadi/akonaditagrepository.cpp b/src/akonadi/akonaditagrepository.cpp
--- a/src/akonadi/akonaditagrepository.cpp
+++ b/src/akonadi/akonaditagrepository.cpp
@@ -67,7 +67,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
         childItem.setTag(akonadiTag);
 
         auto updateJob = m_storage->updateItem(childItem);
@@ -89,7 +89,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
         auto tag = m_serializer->createAkonadiTagFromTag(parent);
         Q_ASSERT(tag.isValid());
         childItem.clearTag(tag);
@@ -115,7 +115,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
         foreach (const Tag &tag, childItem.tags())
             childItem.clearTag(tag);
 
diff --git a/src/akonadi/akonaditaskrepository.cpp b/src/akonadi/akonaditaskrepository.cpp
--- a/src/akonadi/akonaditaskrepository.cpp
+++ b/src/akonadi/akonaditaskrepository.cpp
@@ -145,7 +145,7 @@
            return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto item = fetchItemJob->items().first();
+        auto item = fetchItemJob->items().at(0);
 
         ItemFetchJobInterface *fetchCollectionItemsJob = m_storage->fetchItems(item.parentCollection());
         compositeJob->install(fetchCollectionItemsJob->kjob(), [fetchCollectionItemsJob, item, compositeJob, this] {
@@ -175,7 +175,7 @@
            return;
 
         Q_ASSERT(fetchJob->items().size() == 1);
-        auto item = fetchJob->items().first();
+        auto item = fetchJob->items().at(0);
         m_serializer->promoteItemToProject(item);
 
         auto updateJob = m_storage->updateItem(item);
@@ -196,7 +196,7 @@
            return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
         m_serializer->updateItemParent(childItem, parent);
 
         // Check collections to know if we need to move child
@@ -272,7 +272,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
 
         m_serializer->removeItemParent(childItem);
 
@@ -294,7 +294,7 @@
             return;
 
         Q_ASSERT(fetchItemJob->items().size() == 1);
-        auto childItem = fetchItemJob->items().first();
+        auto childItem = fetchItemJob->items().at(0);
 
         m_serializer->removeItemParent(childItem);
         m_serializer->clearItem(&childItem);
diff --git a/tests/testlib/akonadistoragetestbase.cpp b/tests/testlib/akonadistoragetestbase.cpp
--- a/tests/testlib/akonadistoragetestbase.cpp
+++ b/tests/testlib/akonadistoragetestbase.cpp
@@ -330,7 +330,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedCollection = spy.takeFirst().takeFirst().value<Akonadi::Collection>();
+    auto notifiedCollection = spy.takeFirst().at(0).value<Akonadi::Collection>();
     QCOMPARE(notifiedCollection.name(), collection.name());
 
     auto parent = notifiedCollection.parentCollection();
@@ -362,7 +362,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedCollection= spy.takeFirst().takeFirst().value<Akonadi::Collection>();
+    auto notifiedCollection= spy.takeFirst().at(0).value<Akonadi::Collection>();
     QCOMPARE(notifiedCollection.id(), collection.id());
 }
 
@@ -389,7 +389,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedCollection = spy.takeFirst().takeFirst().value<Akonadi::Collection>();
+    auto notifiedCollection = spy.takeFirst().at(0).value<Akonadi::Collection>();
     QCOMPARE(notifiedCollection.id(), collection.id());
     QCOMPARE(notifiedCollection.name(), collection.name());
 
@@ -432,7 +432,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(*notifiedItem.payload<KCalCore::Todo::Ptr>(), *todo);
     QVERIFY(notifiedItem.hasAttribute<Akonadi::EntityDisplayAttribute>());
 
@@ -465,7 +465,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), item.id());
 
     auto parent = notifiedItem.parentCollection();
@@ -508,7 +508,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), item.id());
     QCOMPARE(*notifiedItem.payload<KCalCore::Todo::Ptr>(), *todo);
     QVERIFY(notifiedItem.hasAttribute<Akonadi::EntityDisplayAttribute>());
@@ -547,7 +547,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), item.id());
     QVERIFY(notifiedItem.hasPayload<KCalCore::Todo::Ptr>());
 
@@ -576,7 +576,7 @@
     auto job = storage->fetchTagItems(tag);
     AKVERIFYEXEC(job->kjob());
 
-    auto item = job->items().first();
+    auto item = job->items().at(0);
     QCOMPARE(item.remoteId(), expectedRemoteIds);
 
     QVERIFY(item.loadedPayloadParts().contains(Akonadi::Item::FullPayload));
@@ -599,7 +599,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), item.id());
     QVERIFY(!notifiedItem.tags().contains(tag));
 }
@@ -628,7 +628,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedTag = spy.takeFirst().takeFirst().value<Akonadi::Tag>();
+    auto notifiedTag = spy.takeFirst().at(0).value<Akonadi::Tag>();
     QCOMPARE(notifiedTag.gid(), tag.gid());
     QCOMPARE(notifiedTag.name(), tag.name());
     QCOMPARE(notifiedTag.type(), tag.type());
@@ -647,7 +647,7 @@
     AKVERIFYEXEC(job->kjob());
 
     QCOMPARE(job->items().size(), 1);
-    auto itemTagged = job->items().first();
+    auto itemTagged = job->items().at(0);
     QCOMPARE(itemTagged.remoteId(), expectedRemoteIds);
 
     // A spied monitor
@@ -665,11 +665,11 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedTag = spy.takeFirst().takeFirst().value<Akonadi::Tag>();
+    auto notifiedTag = spy.takeFirst().at(0).value<Akonadi::Tag>();
     QCOMPARE(notifiedTag.id(), tag.id());
 
     QCOMPARE(spyItemChanged.size(), 1);
-    auto notifiedItem = spyItemChanged.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spyItemChanged.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), itemTagged.id());
 }
 
@@ -695,7 +695,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedTag = spy.takeFirst().takeFirst().value<Akonadi::Tag>();
+    auto notifiedTag = spy.takeFirst().at(0).value<Akonadi::Tag>();
     QCOMPARE(notifiedTag.id(), tag.id());
     QCOMPARE(notifiedTag.name(), tag.name());
 }
@@ -758,7 +758,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), item.id());
 
     // KCalCore 4.83 fixes this bug
@@ -812,12 +812,12 @@
     auto job = storage->fetchItem(item1);
     AKVERIFYEXEC(job->kjob());
     QCOMPARE(job->items().size(), 1);
-    item1 = job->items()[0];
+    item1 = job->items().at(0);
 
     job = storage->fetchItem(item2);
     AKVERIFYEXEC(job->kjob());
     QCOMPARE(job->items().size(), 1);
-    item2 = job->items()[0];
+    item2 = job->items().at(0);
 
     QCOMPARE(item1.payload<KCalCore::Todo::Ptr>()->summary(), QStringLiteral("Buy kiwis"));
     QCOMPARE(item2.payload<KCalCore::Todo::Ptr>()->summary(), QStringLiteral("Buy cheese"));
@@ -856,7 +856,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.parentCollection(), calendar2());
     QCOMPARE(*notifiedItem.payload<KCalCore::Todo::Ptr>(), *todo);
 }
@@ -910,7 +910,7 @@
     QTRY_VERIFY(!spyMoved.isEmpty());
 
     QCOMPARE(spyMoved.size(), 1);
-    auto movedItem = spyMoved.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto movedItem = spyMoved.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(movedItem.id(), item.id());
 }
 
@@ -935,7 +935,7 @@
     QTRY_VERIFY(!spyMoved.isEmpty());
 
     QCOMPARE(spyMoved.size(), 1);
-    auto movedItem = spyMoved.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto movedItem = spyMoved.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(movedItem.id(), item.id());
 }
 
@@ -961,7 +961,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), item.id());
 }
 
@@ -992,9 +992,9 @@
 
     // THEN
     QCOMPARE(spy.size(), 2);
-    auto notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    auto notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), item.id());
-    notifiedItem = spy.takeFirst().takeFirst().value<Akonadi::Item>();
+    notifiedItem = spy.takeFirst().at(0).value<Akonadi::Item>();
     QCOMPARE(notifiedItem.id(), item2.id());
 }
 
@@ -1027,7 +1027,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedTag = spy.takeFirst().takeFirst().value<Akonadi::Tag>();
+    auto notifiedTag = spy.takeFirst().at(0).value<Akonadi::Tag>();
     QCOMPARE(notifiedTag.name(), name);
     QCOMPARE(notifiedTag.type(), type);
     QCOMPARE(notifiedTag.gid(), gid);
@@ -1055,7 +1055,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedTag = spy.takeFirst().takeFirst().value<Akonadi::Tag>();
+    auto notifiedTag = spy.takeFirst().at(0).value<Akonadi::Tag>();
     QCOMPARE(notifiedTag.id(), tag.id());
 }
 
@@ -1080,7 +1080,7 @@
 
     // THEN
     QCOMPARE(spy.size(), 1);
-    auto notifiedTag = spy.takeFirst().takeFirst().value<Akonadi::Tag>();
+    auto notifiedTag = spy.takeFirst().at(0).value<Akonadi::Tag>();
     QCOMPARE(notifiedTag.id(), tag.id());
 }
 
@@ -1112,7 +1112,7 @@
     // THEN
     QCOMPARE(changeSpy.size(), 1);
     QCOMPARE(selectionSpy.size(), 0);
-    auto notifiedCollection = changeSpy.takeFirst().takeFirst().value<Akonadi::Collection>();
+    auto notifiedCollection = changeSpy.takeFirst().at(0).value<Akonadi::Collection>();
     QCOMPARE(notifiedCollection.id(), collection.id());
     QVERIFY(notifiedCollection.hasAttribute<Akonadi::EntityDisplayAttribute>());
     QCOMPARE(notifiedCollection.attribute<Akonadi::EntityDisplayAttribute>()->displayName(), attr->displayName());
@@ -1143,7 +1143,7 @@
     // THEN
     QCOMPARE(changeSpy.size(), 1);
 
-    auto notifiedCollection = changeSpy.takeFirst().takeFirst().value<Akonadi::Collection>();
+    auto notifiedCollection = changeSpy.takeFirst().at(0).value<Akonadi::Collection>();
     QCOMPARE(notifiedCollection.id(), collection.id());
     QVERIFY(notifiedCollection.hasAttribute<Akonadi::TimestampAttribute>());
 }
@@ -1177,12 +1177,12 @@
     QCOMPARE(changeSpy.size(), 1);
     QCOMPARE(selectionSpy.size(), 1);
 
-    auto notifiedCollection = changeSpy.takeFirst().takeFirst().value<Akonadi::Collection>();
+    auto notifiedCollection = changeSpy.takeFirst().at(0).value<Akonadi::Collection>();
     QCOMPARE(notifiedCollection.id(), collection.id());
     QVERIFY(notifiedCollection.hasAttribute<Akonadi::ApplicationSelectedAttribute>());
     QVERIFY(!notifiedCollection.attribute<Akonadi::ApplicationSelectedAttribute>()->isSelected());
 
-    notifiedCollection = selectionSpy.takeFirst().takeFirst().value<Akonadi::Collection>();
+    notifiedCollection = selectionSpy.takeFirst().at(0).value<Akonadi::Collection>();
     QCOMPARE(notifiedCollection.id(), collection.id());
     QVERIFY(notifiedCollection.hasAttribute<Akonadi::ApplicationSelectedAttribute>());
     QVERIFY(!notifiedCollection.attribute<Akonadi::ApplicationSelectedAttribute>()->isSelected());
@@ -1262,7 +1262,7 @@
     // THEN
     QCOMPARE(changeSpy.size(), 1);
 
-    auto notifiedCollection = changeSpy.takeFirst().takeFirst().value<Akonadi::Collection>();
+    auto notifiedCollection = changeSpy.takeFirst().at(0).value<Akonadi::Collection>();
     QCOMPARE(notifiedCollection.id(), collection.id());
     QCOMPARE(notifiedCollection.enabled(), isEnabled);
     QCOMPARE(notifiedCollection.referenced(), isReferenced);
@@ -1404,7 +1404,7 @@
         return Akonadi::Item();
     }
 
-    return job->items().first();
+    return job->items().at(0);
 }
 
 Akonadi::Collection AkonadiStorageTestBase::fetchCollectionByRID(const QString &remoteId)
@@ -1425,7 +1425,7 @@
         return Akonadi::Collection();
     }
 
-    return job->collections().first();
+    return job->collections().at(0);
 }
 
 Akonadi::Tag AkonadiStorageTestBase::fetchTagByGID(const QString &gid)
diff --git a/tests/units/presentation/applicationmodeltest.cpp b/tests/units/presentation/applicationmodeltest.cpp
--- a/tests/units/presentation/applicationmodeltest.cpp
+++ b/tests/units/presentation/applicationmodeltest.cpp
@@ -145,7 +145,7 @@
         // THEN
         QCOMPARE(app.currentPage(), page);
         QCOMPARE(spy.count(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<QObject*>(), page);
+        QCOMPARE(spy.takeFirst().at(0).value<QObject*>(), page);
     }
 
     void shouldSupportNullPage()
@@ -163,7 +163,7 @@
         // THEN
         QVERIFY(!app.currentPage());
         QCOMPARE(spy.count(), 1);
-        QVERIFY(!spy.takeFirst().takeFirst().value<QObject*>());
+        QVERIFY(!spy.takeFirst().at(0).value<QObject*>());
     }
 
     void shouldTakeOwnershipOfCurrentPage()
diff --git a/tests/units/presentation/artifacteditormodeltest.cpp b/tests/units/presentation/artifacteditormodeltest.cpp
--- a/tests/units/presentation/artifacteditormodeltest.cpp
+++ b/tests/units/presentation/artifacteditormodeltest.cpp
@@ -105,27 +105,27 @@
         QVERIFY(model.hasTaskProperties());
 
         QCOMPARE(textSpy.size(), 1);
-        QCOMPARE(textSpy.takeFirst().takeFirst().toString(), task->text());
+        QCOMPARE(textSpy.takeFirst().at(0).toString(), task->text());
         QCOMPARE(model.property("text").toString(), task->text());
 
         QCOMPARE(titleSpy.size(), 1);
-        QCOMPARE(titleSpy.takeFirst().takeFirst().toString(), task->title());
+        QCOMPARE(titleSpy.takeFirst().at(0).toString(), task->title());
         QCOMPARE(model.property("title").toString(), task->title());
 
         QCOMPARE(doneSpy.size(), 1);
-        QCOMPARE(doneSpy.takeFirst().takeFirst().toBool(), task->isDone());
+        QCOMPARE(doneSpy.takeFirst().at(0).toBool(), task->isDone());
         QCOMPARE(model.property("done").toBool(), task->isDone());
 
         QCOMPARE(startSpy.size(), 1);
-        QCOMPARE(startSpy.takeFirst().takeFirst().toDateTime(), task->startDate());
+        QCOMPARE(startSpy.takeFirst().at(0).toDateTime(), task->startDate());
         QCOMPARE(model.property("startDate").toDateTime(), task->startDate());
 
         QCOMPARE(dueSpy.size(), 1);
-        QCOMPARE(dueSpy.takeFirst().takeFirst().toDateTime(), task->dueDate());
+        QCOMPARE(dueSpy.takeFirst().at(0).toDateTime(), task->dueDate());
         QCOMPARE(model.property("dueDate").toDateTime(), task->dueDate());
 
         QCOMPARE(delegateSpy.size(), 1);
-        QCOMPARE(delegateSpy.takeFirst().takeFirst().toString(), task->delegate().display());
+        QCOMPARE(delegateSpy.takeFirst().at(0).toString(), task->delegate().display());
         QCOMPARE(model.property("delegateText").toString(), task->delegate().display());
     }
 
@@ -154,27 +154,27 @@
         QVERIFY(!model.hasTaskProperties());
 
         QCOMPARE(textSpy.size(), 1);
-        QCOMPARE(textSpy.takeFirst().takeFirst().toString(), note->text());
+        QCOMPARE(textSpy.takeFirst().at(0).toString(), note->text());
         QCOMPARE(model.property("text").toString(), note->text());
 
         QCOMPARE(titleSpy.size(), 1);
-        QCOMPARE(titleSpy.takeFirst().takeFirst().toString(), note->title());
+        QCOMPARE(titleSpy.takeFirst().at(0).toString(), note->title());
         QCOMPARE(model.property("title").toString(), note->title());
 
         QCOMPARE(doneSpy.size(), 1);
-        QCOMPARE(doneSpy.takeFirst().takeFirst().toBool(), false);
+        QCOMPARE(doneSpy.takeFirst().at(0).toBool(), false);
         QCOMPARE(model.property("done").toBool(), false);
 
         QCOMPARE(startSpy.size(), 1);
-        QVERIFY(startSpy.takeFirst().takeFirst().toDateTime().isNull());
+        QVERIFY(startSpy.takeFirst().at(0).toDateTime().isNull());
         QVERIFY(model.property("startDate").toDateTime().isNull());
 
         QCOMPARE(dueSpy.size(), 1);
-        QVERIFY(dueSpy.takeFirst().takeFirst().toDateTime().isNull());
+        QVERIFY(dueSpy.takeFirst().at(0).toDateTime().isNull());
         QVERIFY(model.property("dueDate").toDateTime().isNull());
 
         QCOMPARE(delegateSpy.size(), 1);
-        QVERIFY(delegateSpy.takeFirst().takeFirst().toString().isEmpty());
+        QVERIFY(delegateSpy.takeFirst().at(0).toString().isEmpty());
         QVERIFY(model.property("delegateText").toString().isEmpty());
     }
 
@@ -238,7 +238,7 @@
 
         // THEN
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst(), propertyValue);
+        QCOMPARE(spy.takeFirst().at(0), propertyValue);
         QCOMPARE(model.property(propertyName), propertyValue);
     }
 
@@ -255,7 +255,7 @@
 
         // THEN
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst().toString(), task->delegate().display());
+        QCOMPARE(spy.takeFirst().at(0).toString(), task->delegate().display());
         QCOMPARE(model.property("delegateText").toString(), task->delegate().display());
     }
 
@@ -288,7 +288,7 @@
 
         // THEN
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst(), propertyValue);
+        QCOMPARE(spy.takeFirst().at(0), propertyValue);
         QCOMPARE(model.property(propertyName), propertyValue);
         QVERIFY(artifact->property(propertyName) != propertyValue);
         QVERIFY(!savedArtifact);
@@ -331,7 +331,7 @@
 
         // THEN
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst(), propertyValue);
+        QCOMPARE(spy.takeFirst().at(0), propertyValue);
         QCOMPARE(model.property(propertyName), propertyValue);
         QVERIFY(artifact->property(propertyName) != propertyValue);
         QVERIFY(!savedArtifact);
@@ -382,7 +382,7 @@
 
         // THEN
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst(), propertyValue);
+        QCOMPARE(spy.takeFirst().at(0), propertyValue);
         QCOMPARE(model->property(propertyName), propertyValue);
         QVERIFY(artifact->property(propertyName) != propertyValue);
         QVERIFY(!savedArtifact);
diff --git a/tests/units/testlib/akonadifakedatatest.cpp b/tests/units/testlib/akonadifakedatatest.cpp
--- a/tests/units/testlib/akonadifakedatatest.cpp
+++ b/tests/units/testlib/akonadifakedatatest.cpp
@@ -119,8 +119,8 @@
         QCOMPARE(data.collection(c2.id()), c2);
 
         QCOMPARE(spy.size(), 2);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Collection>(), c1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Collection>(), c2);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Collection>(), c1);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Collection>(), c2);
     }
 
     void shouldModifyCollections()
@@ -145,7 +145,7 @@
         QCOMPARE(data.collection(c1.id()), c2);
 
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Collection>(), c2);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Collection>(), c2);
     }
 
     void shouldNotLooseParentCollectionOnModifyCollection()
@@ -218,7 +218,7 @@
         // THEN
         QVERIFY(data.childCollections(c1.id()).isEmpty());
         QCOMPARE(data.childCollections(c2.id()).size(), 1);
-        QCOMPARE(data.childCollections(c2.id()).first(), c3);
+        QCOMPARE(data.childCollections(c2.id()).at(0), c3);
     }
 
     void shouldRemoveCollections()
@@ -257,7 +257,7 @@
 
         // THEN
         QCOMPARE(data.collections().size(), 1);
-        QCOMPARE(data.collections().first(), c1);
+        QCOMPARE(data.collections().at(0), c1);
 
         QVERIFY(!data.collection(c2.id()).isValid());
         QVERIFY(!data.collection(c3.id()).isValid());
@@ -275,8 +275,8 @@
         QVERIFY(data.childItems(c3.id()).isEmpty());
 
         QCOMPARE(spy.size(), 2);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Collection>(), c3);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Collection>(), c2);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Collection>(), c3);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Collection>(), c2);
     }
 
     void shouldCreateTags()
@@ -303,8 +303,8 @@
         QCOMPARE(data.tag(t2.id()), t2);
 
         QCOMPARE(spy.size(), 2);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Tag>(), t1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Tag>(), t2);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Tag>(), t1);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Tag>(), t2);
     }
 
     void shouldModifyTags()
@@ -329,7 +329,7 @@
         QCOMPARE(data.tag(t1.id()), t2);
 
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Tag>(), t2);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Tag>(), t2);
     }
 
     void shouldRemoveTags()
@@ -370,12 +370,12 @@
 
         // THEN
         QCOMPARE(data.tags().size(), 1);
-        QCOMPARE(data.tags().first(), t1);
+        QCOMPARE(data.tags().at(0), t1);
 
         QVERIFY(!data.tag(t2.id()).isValid());
 
         QCOMPARE(data.tagItems(t1.id()).size(), 1);
-        QCOMPARE(data.tagItems(t1.id()).first(), i1);
+        QCOMPARE(data.tagItems(t1.id()).at(0), i1);
         QVERIFY(data.tagItems(t2.id()).isEmpty());
 
         QCOMPARE(data.items().toList().toSet(), itemSet);
@@ -385,11 +385,11 @@
         QVERIFY(!data.item(i2.id()).tags().contains(t2));
 
         QCOMPARE(tagSpy.size(), 1);
-        QCOMPARE(tagSpy.takeFirst().takeFirst().value<Akonadi::Tag>(), t2);
+        QCOMPARE(tagSpy.takeFirst().at(0).value<Akonadi::Tag>(), t2);
 
         QCOMPARE(itemSpy.size(), 1);
-        QCOMPARE(itemSpy.first().first().value<Akonadi::Item>(), i2);
-        QVERIFY(!itemSpy.first().first().value<Akonadi::Item>().tags().contains(t2));
+        QCOMPARE(itemSpy.first().at(0).value<Akonadi::Item>(), i2);
+        QVERIFY(!itemSpy.first().at(0).value<Akonadi::Item>().tags().contains(t2));
     }
 
     void shouldCreateItems()
@@ -415,8 +415,8 @@
         QCOMPARE(data.item(i2.id()), i2);
 
         QCOMPARE(spy.size(), 2);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Item>(), i1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Item>(), i2);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Item>(), i1);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Item>(), i2);
     }
 
     void shouldModifyItems()
@@ -448,7 +448,7 @@
         QCOMPARE(data.item(i1.id()), i2);
 
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Item>(), i2);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Item>(), i2);
 
         QCOMPARE(moveSpy.size(), 0);
     }
@@ -496,7 +496,7 @@
 
         // THEN
         QCOMPARE(data.childItems(c1.id()).size(), 1);
-        QCOMPARE(data.childItems(c1.id()).first(), i1);
+        QCOMPARE(data.childItems(c1.id()).at(0), i1);
     }
 
     void shouldReparentItemsOnModify()
@@ -527,10 +527,10 @@
         // THEN
         QVERIFY(data.childItems(c1.id()).isEmpty());
         QCOMPARE(data.childItems(c2.id()).size(), 1);
-        QCOMPARE(data.childItems(c2.id()).first(), i1);
+        QCOMPARE(data.childItems(c2.id()).at(0), i1);
 
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Item>(), i1);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Item>(), i1);
     }
 
     void shouldListTagItems()
@@ -550,7 +550,7 @@
 
         // THEN
         QCOMPARE(data.tagItems(t1.id()).size(), 1);
-        QCOMPARE(data.tagItems(t1.id()).first(), i1);
+        QCOMPARE(data.tagItems(t1.id()).at(0), i1);
     }
 
     void shouldRetagItemsOnModify()
@@ -582,10 +582,10 @@
         // THEN
         QVERIFY(data.tagItems(t1.id()).isEmpty());
         QCOMPARE(data.tagItems(t2.id()).size(), 1);
-        QCOMPARE(data.tagItems(t2.id()).first(), i1);
+        QCOMPARE(data.tagItems(t2.id()).at(0), i1);
 
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Item>(), i1);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Item>(), i1);
     }
 
     void shouldRemoveItems()
@@ -613,7 +613,7 @@
         QVERIFY(data.childItems(c1.id()).isEmpty());
 
         QCOMPARE(spy.size(), 1);
-        QCOMPARE(spy.takeFirst().takeFirst().value<Akonadi::Item>(), i1);
+        QCOMPARE(spy.takeFirst().at(0).value<Akonadi::Item>(), i1);
     }
 };