diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 82b0cbd0c4..dcfccceb28 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -3241,6 +3241,7 @@ class TestScheduler(testtools.TestCase):
             self.assertEqual(
                 enqueue_times[str(item.change)], item.enqueue_time)
 
+        self.waitUntilSettled()
         self.worker.release('.*-merge')
         self.waitUntilSettled()
         self.worker.release('.*-merge')
@@ -3307,6 +3308,7 @@ class TestScheduler(testtools.TestCase):
         r = client.promote(pipeline='gate',
                            change_ids=['3,1'])
 
+        self.waitUntilSettled()
         self.worker.release('.*-merge')
         self.waitUntilSettled()
         self.worker.release('.*-merge')