Merge "Make smtp test more robust"
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 9baa824..a7548c1 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -2131,6 +2131,7 @@
                         'tests/fixtures/layout-no-timer.yaml')
         self.sched.reconfigure(self.config)
         self.registerJobs()
+        self.waitUntilSettled()
         self.worker.release('.*')
         self.waitUntilSettled()