diff --git a/src/akonadi/akonadistorage.cpp b/src/akonadi/akonadistorage.cpp
--- a/src/akonadi/akonadistorage.cpp
+++ b/src/akonadi/akonadistorage.cpp
@@ -72,7 +72,7 @@
         // Memorize them to reconstruct the ancestor chain later
         QMap<Collection::Id, Collection> collectionsMap;
         collectionsMap[m_collection.id()] = m_collection;
-        for (auto collection : collections) {
+        foreach (const auto &collection, collections) {
             collectionsMap[collection.id()] = collection;
         }
 
@@ -149,7 +149,7 @@
         // Memorize them to reconstruct the ancestor chain later
         QMap<Collection::Id, Collection> collectionsMap;
         collectionsMap[Akonadi::Collection::root().id()] = Akonadi::Collection::root();
-        for (auto collection : collections) {
+        foreach (const auto &collection, collections) {
             collectionsMap[collection.id()] = collection;
         }
 
diff --git a/src/akonadi/akonadistoragesettings.cpp b/src/akonadi/akonadistoragesettings.cpp
--- a/src/akonadi/akonadistoragesettings.cpp
+++ b/src/akonadi/akonadistoragesettings.cpp
@@ -44,7 +44,7 @@
     KConfigGroup config(KSharedConfig::openConfig(), "General");
     QList<Collection::Id> ids = config.readEntry("activeCollections", QList<Collection::Id>());
     Collection::List list;
-    for (auto id : ids) {
+    foreach (const auto &id, ids) {
         list << Collection(id);
     }
     return list;
diff --git a/src/utils/jobhandler.cpp b/src/utils/jobhandler.cpp
--- a/src/utils/jobhandler.cpp
+++ b/src/utils/jobhandler.cpp
@@ -43,11 +43,11 @@
     {
         Q_ASSERT(m_handlers.contains(job) || m_handlersWithJob.contains(job));
 
-        for (auto handler : m_handlers.take(job)) {
+        foreach (const auto &handler, m_handlers.take(job)) {
             handler();
         }
 
-        for (auto handler : m_handlersWithJob.take(job)) {
+        foreach (const auto &handler, m_handlersWithJob.take(job)) {
             handler(job);
         }
     }
diff --git a/src/zanshin/migrator/zanshin021migrator.cpp b/src/zanshin/migrator/zanshin021migrator.cpp
--- a/src/zanshin/migrator/zanshin021migrator.cpp
+++ b/src/zanshin/migrator/zanshin021migrator.cpp
@@ -51,11 +51,11 @@
     collectionsJob->kjob()->exec();
 
     auto collections = collectionsJob->collections();
-    for (const auto &collection : collections) {
+    foreach (const auto &collection, collections) {
         auto job = m_storage.fetchItems(collection);
         job->kjob()->exec();
         auto items = job->items();
-        for (const Akonadi::Item &item : items) {
+        foreach (const Akonadi::Item &item, items) {
             if (item.hasPayload<KCalCore::Todo::Ptr>()) {
                 auto todo = item.payload<KCalCore::Todo::Ptr>();
                 hash.insert(todo->uid(), SeenItem(item));
diff --git a/tests/features/cuke-steps.cpp b/tests/features/cuke-steps.cpp
--- a/tests/features/cuke-steps.cpp
+++ b/tests/features/cuke-steps.cpp
@@ -777,7 +777,7 @@
         QModelIndex expectedIndex = referenceModel->index(row, 0);
         QModelIndex resultIndex = context->indices.at(row);
 
-        for (auto role : usedRoles) {
+        foreach (const auto &role, usedRoles) {
             COMPARE_OR_DUMP(Zanshin::indexString(resultIndex, role),
                             Zanshin::indexString(expectedIndex, role));
         }
diff --git a/tests/testlib/akonadidebug.cpp b/tests/testlib/akonadidebug.cpp
--- a/tests/testlib/akonadidebug.cpp
+++ b/tests/testlib/akonadidebug.cpp
@@ -35,11 +35,11 @@
                                             Akonadi::StorageInterface::Recursive,
                                             Akonadi::StorageInterface::AllContent);
     colJob->kjob()->exec();
-    for (const auto &col : colJob->collections()) {
+    foreach (const auto &col, colJob->collections()) {
         qDebug() << "COL:" << col.id() << col.name() << col.remoteId();
         auto itemJob = storage->fetchItems(col);
         itemJob->kjob()->exec();
-        for (const auto &item : itemJob->items()) {
+        foreach (const auto &item, itemJob->items()) {
             QString summary;
             if (item.hasPayload<KCalCore::Todo::Ptr>())
                 summary = item.payload<KCalCore::Todo::Ptr>()->summary();
@@ -49,7 +49,7 @@
 
     auto tagJob = storage->fetchTags();
     tagJob->kjob()->exec();
-    for (const auto &tag : tagJob->tags()) {
+    foreach (const auto &tag, tagJob->tags()) {
         qDebug() << "TAG:" << tag.id() << tag.name();
     }
 }
diff --git a/tests/testlib/akonadistoragetestbase.cpp b/tests/testlib/akonadistoragetestbase.cpp
--- a/tests/testlib/akonadistoragetestbase.cpp
+++ b/tests/testlib/akonadistoragetestbase.cpp
@@ -159,7 +159,7 @@
     // THEN
     auto collections = job->collections();
     QStringList collectionNames;
-    for (const auto &collection : collections) {
+    foreach (const auto &collection, collections) {
         collectionNames << collection.name();
     }
     collectionNames.sort();
@@ -189,7 +189,7 @@
 
     // THEN
     auto collections = job->collections();
-    for (const auto &collection : collections) {
+    foreach (const auto &collection, collections) {
         auto parent = collection.parentCollection();
         while (parent != Akonadi::Collection::root()) {
             QVERIFY(parent.isValid());
@@ -216,16 +216,16 @@
     // THEN
     auto items = job->items();
     QStringList itemRemoteIds;
-    for (const auto &item : items) {
+    foreach (const auto &item, items) {
         itemRemoteIds << item.remoteId();
         QVERIFY(item.loadedPayloadParts().contains(Akonadi::Item::FullPayload));
         QVERIFY(!item.attributes().isEmpty());
         QVERIFY(item.modificationTime().isValid());
         QVERIFY(!item.flags().isEmpty());
 
         Akonadi::Tag::List tags = item.tags();
         QVERIFY(!item.tags().isEmpty());
-        for (const auto &tag : tags) {
+        foreach (const auto &tag, tags) {
             QVERIFY(tag.isValid());
             QVERIFY(!tag.name().isEmpty());
             QVERIFY(!tag.type().isEmpty());
@@ -260,7 +260,7 @@
     // THEN
     auto tags = job->tags();
     QStringList tagGids;
-    for (const Akonadi::Tag &tag : tags) {
+    foreach (const auto &tag, tags) {
         tagGids << tag.gid();
         QVERIFY(!tag.name().isEmpty());
         QVERIFY(!tag.type().isEmpty());
@@ -286,7 +286,7 @@
     // THEN
     auto items = job->items();
     QStringList itemRemoteIds;
-    for (const auto &item : items) {
+    foreach (const auto &item, items) {
         itemRemoteIds << item.remoteId();
 
         QVERIFY(item.loadedPayloadParts().contains(Akonadi::Item::FullPayload));
@@ -554,7 +554,7 @@
     Akonadi::Tag::List notifiedTags = notifiedItem.tags();
 
     QVERIFY(notifiedTags.contains(tag));
-    for (const auto &tag : notifiedTags) {
+    foreach (const auto &tag, notifiedTags) {
         QVERIFY(tag.isValid());
         QVERIFY(!tag.name().isEmpty());
         QVERIFY(!tag.type().isEmpty());
@@ -1375,7 +1375,7 @@
 
     // THEN
     auto collections = job->collections();
-    for (const auto &collection : collections) {
+    foreach (const auto &collection, collections) {
         auto parent = collection.parentCollection();
         while (parent != Akonadi::Collection::root()) {
             QVERIFY(parent.isValid());
@@ -1437,7 +1437,7 @@
     }
 
     auto tags = job->tags();
-    for (const Akonadi::Tag &tag : tags) {
+    foreach (const auto &tag, tags) {
         if (tag.gid() == gid)
             return tag;
     }
diff --git a/tests/units/akonadi/akonadistoragesettingstest.cpp b/tests/units/akonadi/akonadistoragesettingstest.cpp
--- a/tests/units/akonadi/akonadistoragesettingstest.cpp
+++ b/tests/units/akonadi/akonadistoragesettingstest.cpp
@@ -62,7 +62,7 @@
     Akonadi::Collection::List colList(int max)
     {
         Akonadi::Collection::List list;
-        for (auto id : idList(max)) {
+        foreach (auto id, idList(max)) {
             list << Collection(id);
         }
         return list;
diff --git a/tests/units/presentation/querytreemodeltest.cpp b/tests/units/presentation/querytreemodeltest.cpp
--- a/tests/units/presentation/querytreemodeltest.cpp
+++ b/tests/units/presentation/querytreemodeltest.cpp
@@ -118,12 +118,12 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
 
         auto childrenTasks = createChildrenTasks();
         auto childrenProvider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : childrenTasks)
+        foreach (const auto &task, childrenTasks)
             childrenProvider->append(task);
 
         auto childrenList = Domain::QueryResult<Domain::Task::Ptr>::create(childrenProvider);
@@ -232,7 +232,7 @@
 
         auto childrenTasks = createChildrenTasks();
         auto childrenProvider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : childrenTasks)
+        foreach (const auto &task, childrenTasks)
             childrenProvider->append(task);
 
         auto childrenList = Domain::QueryResult<Domain::Task::Ptr>::create(childrenProvider);
@@ -296,7 +296,7 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
 
         auto childrenTasks = createChildrenTasks();
@@ -365,12 +365,12 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
 
         auto childrenTasks = createChildrenTasks();
         auto childrenProvider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : childrenTasks)
+        foreach (const auto &task, childrenTasks)
             childrenProvider->append(task);
 
         auto childrenList = Domain::QueryResult<Domain::Task::Ptr>::create(childrenProvider);
@@ -468,12 +468,12 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
 
         auto childrenTasks = createChildrenTasks();
         auto childrenProvider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : childrenTasks)
+        foreach (const auto &task, childrenTasks)
             childrenProvider->append(task);
 
         auto childrenList = Domain::QueryResult<Domain::Task::Ptr>::create(childrenProvider);
@@ -537,12 +537,12 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
 
         auto childrenTasks = createChildrenTasks();
         auto childrenProvider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : childrenTasks)
+        foreach (const auto &task, childrenTasks)
             childrenProvider->append(task);
 
         auto childrenList = Domain::QueryResult<Domain::Task::Ptr>::create(childrenProvider);
@@ -607,12 +607,12 @@
         const int taskPos = 1;
         const auto task = tasks[taskPos];
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
 
         auto childrenTasks = createChildrenTasks();
         auto childrenProvider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : childrenTasks)
+        foreach (const auto &task, childrenTasks)
             childrenProvider->append(task);
         
         auto childrenList = Domain::QueryResult<Domain::Task::Ptr>::create(childrenProvider);
diff --git a/tests/units/presentation/tasklistmodeltest.cpp b/tests/units/presentation/tasklistmodeltest.cpp
--- a/tests/units/presentation/tasklistmodeltest.cpp
+++ b/tests/units/presentation/tasklistmodeltest.cpp
@@ -68,7 +68,7 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
         auto list = Domain::QueryResult<Domain::Task::Ptr>::create(provider);
 
@@ -125,7 +125,7 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
         auto list = Domain::QueryResult<Domain::Task::Ptr>::create(provider);
 
@@ -154,7 +154,7 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
         auto list = Domain::QueryResult<Domain::Task::Ptr>::create(provider);
 
@@ -178,7 +178,7 @@
         // GIVEN
         auto tasks = createTasks();
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
         auto list = Domain::QueryResult<Domain::Task::Ptr>::create(provider);
 
@@ -204,7 +204,7 @@
         const auto task = tasks[taskPos];
 
         auto provider = Domain::QueryResultProvider<Domain::Task::Ptr>::Ptr::create();
-        for (auto task : tasks)
+        foreach (const auto &task, tasks)
             provider->append(task);
         auto list = Domain::QueryResult<Domain::Task::Ptr>::create(provider);