diff --git a/maxscale-system-test/mysqlmon_failover_stress.cpp b/maxscale-system-test/mysqlmon_failover_stress.cpp
index 4d698cbed..6ccb6d8a2 100755
--- a/maxscale-system-test/mysqlmon_failover_stress.cpp
+++ b/maxscale-system-test/mysqlmon_failover_stress.cpp
@@ -488,6 +488,16 @@ void check_server_statuses(TestConnections& test)
     masters += check_server_status(test, 2);
     masters += check_server_status(test, 3);
     masters += check_server_status(test, 4);
+
+    if (masters == 0)
+    {
+        test.tprintf("No master, checking that autofail has been turned off.");
+        test.log_includes(0, "disabling automatic failover");
+    }
+    else if (masters != 1)
+    {
+        test.assert(!true, "Unexpected number of masters: %d", masters);
+    }
 }
 
 void run(TestConnections& test)