diff --git a/tests/units/akonadi/akonadicachingstoragetest.cpp b/tests/units/akonadi/akonadicachingstoragetest.cpp
--- a/tests/units/akonadi/akonadicachingstoragetest.cpp
+++ b/tests/units/akonadi/akonadicachingstoragetest.cpp
@@ -213,9 +213,7 @@
         QFETCH(QStringList, expectedCachedNames);
 
         {
-            const auto collectionFetchNames = [job, toCollectionNames]{
-                return toCollectionNames(job->collections());
-            }();
+            const auto collectionFetchNames = toCollectionNames(job->collections());
             QCOMPARE(collectionFetchNames, expectedFetchNames);
 
             const auto collectionCachedNames = [cache, toCollectionNames]{
@@ -232,9 +230,7 @@
         QVERIFY2(job->kjob()->exec(), qPrintable(job->kjob()->errorString()));
 
         {
-            const auto collectionFetchNames = [job, toCollectionNames]{
-                return toCollectionNames(job->collections());
-            }();
+            const auto collectionFetchNames = toCollectionNames(job->collections());
             QCOMPARE(collectionFetchNames, expectedFetchNames);
 
             const auto collectionCachedNames = [cache, toCollectionNames]{
@@ -282,9 +278,7 @@
 
         auto expectedIds = QVector<Akonadi::Item::Id>() << 42 << 45 << 52;
         {
-            const auto itemFetchIds = [job, toItemIds]{
-                return toItemIds(job->items());
-            }();
+            const auto itemFetchIds = toItemIds(job->items());
             QCOMPARE(itemFetchIds, expectedIds);
 
             const auto itemCachedIds = [cache, toItemIds]{
@@ -301,9 +295,7 @@
         QVERIFY2(job->kjob()->exec(), qPrintable(job->kjob()->errorString()));
 
         {
-            const auto itemFetchIds = [job, toItemIds]{
-                return toItemIds(job->items());
-            }();
+            const auto itemFetchIds = toItemIds(job->items());
             QCOMPARE(itemFetchIds, expectedIds);
 
             const auto itemCachedIds = [cache, toItemIds]{
@@ -351,9 +343,7 @@
 
         auto expectedIds = QVector<Akonadi::Item::Id>() << 44;
         {
-            const auto itemFetchIds = [job, toItemIds]{
-                return toItemIds(job->items());
-            }();
+            const auto itemFetchIds = toItemIds(job->items());
             QCOMPARE(itemFetchIds, expectedIds);
             QVERIFY(!cache->item(44).isValid());
         }
@@ -368,9 +358,7 @@
         QVERIFY2(job->kjob()->exec(), qPrintable(job->kjob()->errorString()));
 
         {
-            const auto itemFetchIds = [job, toItemIds]{
-                return toItemIds(job->items());
-            }();
+            const auto itemFetchIds = toItemIds(job->items());
             QCOMPARE(itemFetchIds, expectedIds);
             QVERIFY(cache->item(44).isValid());
         }
@@ -416,9 +404,7 @@
 
         auto expectedIds = QVector<Akonadi::Item::Id>() << 45 << 48 << 50 << 52;
         {
-            const auto itemFetchIds = [job, toItemIds]{
-                return toItemIds(job->items());
-            }();
+            const auto itemFetchIds = toItemIds(job->items());
             QCOMPARE(itemFetchIds, expectedIds);
 
             const auto itemCachedIds = [cache, toItemIds]{
@@ -435,9 +421,7 @@
         QVERIFY2(job->kjob()->exec(), qPrintable(job->kjob()->errorString()));
 
         {
-            const auto itemFetchIds = [job, toItemIds]{
-                return toItemIds(job->items());
-            }();
+            const auto itemFetchIds = toItemIds(job->items());
             QCOMPARE(itemFetchIds, expectedIds);
 
             const auto itemCachedIds = [cache, toItemIds]{
@@ -479,9 +463,7 @@
         auto expectedNames = QStringList() << "42Plain" << "43Context" << "44Plain";
 
         {
-            const auto tagFetchNames = [job, toTagNames]{
-                return toTagNames(job->tags());
-            }();
+            const auto tagFetchNames = toTagNames(job->tags());
             QCOMPARE(tagFetchNames, expectedNames);
 
             const auto tagCachedNames = [cache, toTagNames]{
@@ -498,9 +480,7 @@
         QVERIFY2(job->kjob()->exec(), qPrintable(job->kjob()->errorString()));
 
         {
-            const auto tagFetchNames = [job, toTagNames]{
-                return toTagNames(job->tags());
-            }();
+            const auto tagFetchNames = toTagNames(job->tags());
             QCOMPARE(tagFetchNames, expectedNames);
 
             const auto tagCachedNames = [cache, toTagNames]{