1 files changed, 5 insertions, 1 deletions

diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index f639d94..65004b6 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -503,12 +503,13 @@ private slots:
             Folder folder2(resource2.identifier());
             VERIFYEXEC(Sink::Store::create<Folder>(folder2));
         }
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << resource1.identifier()));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << resource2.identifier()));
 
         // Test
         Sink::Query query;
         query.resourceFilter<SinkResource::Account>(account1);
 
-        // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
         auto folders = Sink::Store::read<Folder>(query);
         QCOMPARE(folders.size(), 1);
     }
@@ -626,6 +627,9 @@ private slots:
         Folder folder2(resource2.identifier());
         VERIFYEXEC(Sink::Store::create<Folder>(folder2));
 
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << resource1.identifier()));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << resource2.identifier()));
+
         // Test
         Sink::Query query;
         query.resourceContainsFilter<SinkResource::Capabilities>("cap1");