diff --git a/maxscale-system-test/false_monitor_state_change.cpp b/maxscale-system-test/false_monitor_state_change.cpp
index a6693b888..9b00466e2 100644
--- a/maxscale-system-test/false_monitor_state_change.cpp
+++ b/maxscale-system-test/false_monitor_state_change.cpp
@@ -12,17 +12,14 @@ int main(int argc, char* argv[])
     test.repl->block_node(0);
 
     test.tprintf("Wait for monitor to see it");
-    sleep(10);
+    test.maxscales->wait_for_monitor();
 
     test.tprintf("Clear master status");
     test.maxscales->ssh_node(0, "maxadmin clear server server1 master", true);
-    sleep(5);
+    test.maxscales->wait_for_monitor();
 
     test.repl->unblock_node(0);
-    sleep(5);
-
-    test.check_maxscale_alive(0);
-    test.check_log_err(0, "debug assert", false);
+    test.maxscales->wait_for_monitor();
 
     return test.global_result;
 }