diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index e0b699ffd46af59f27db87d79e955d14441c83e1..a4f7fb18bef0cf14c82fe64b2b30fd01f27161f5 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -493,8 +493,8 @@ TEST_P(SchedulerTest, archive_and_retrieve_new_file) {
     request.requester.name = s_userName;
     request.requester.group = "userGroup";
     scheduler.queueRetrieve("disk_instance", request, lc);
+    scheduler.waitSchedulerDbSubthreadsComplete();
   }
-  scheduler.waitSchedulerDbSubthreadsComplete();
 
   // Check that the retrieve request is queued
   {