diff --git a/maxscale-system-test/mysqlmon_failover_auto.cpp b/maxscale-system-test/mysqlmon_failover_auto.cpp
index 6767b6e7e..a911a79d4 100644
--- a/maxscale-system-test/mysqlmon_failover_auto.cpp
+++ b/maxscale-system-test/mysqlmon_failover_auto.cpp
@@ -21,13 +21,13 @@ int main(int argc, char** argv)
     test.repl->connect();
     delete_slave_binlogs(test);
 
-    test.maxscales->wait_for_monitor();
+    test.maxscales->wait_for_monitor(2);
     basic_test(test);
     print_gtids(test);
 
     // Part 1
     int node0_id = prepare_test_1(test);
-    test.maxscales->wait_for_monitor();
+    test.maxscales->wait_for_monitor(2);
     check_test_1(test, node0_id);
 
     if (test.global_result != 0)
@@ -37,7 +37,7 @@ int main(int argc, char** argv)
 
     // Part 2
     prepare_test_2(test);
-    test.maxscales->wait_for_monitor();
+    test.maxscales->wait_for_monitor(2);
     check_test_2(test);
 
     if (test.global_result != 0)
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
 
     // Part 3
     prepare_test_3(test);
-    test.maxscales->wait_for_monitor();
+    test.maxscales->wait_for_monitor(2);
     check_test_3(test);
 
     return test.global_result;