diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index f8fb6dfe4..27dc02262 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -263,8 +263,8 @@ add_test_executable(mysqlmon_failover_manual2.cpp mysqlmon_failover_manual2_4 my
 add_test_executable(mysqlmon_failover_manual2.cpp mysqlmon_failover_manual2_3 mysqlmon_failover_manual2_3 LABELS mysqlmon REPL_BACKEND)
 add_test_executable(mysqlmon_failover_manual2.cpp mysqlmon_failover_manual2_2 mysqlmon_failover_manual2_2 LABELS mysqlmon REPL_BACKEND)
 
-# MySQL Monitor manual failover with bad master
-add_test_executable(mysqlmon_failover_bad_master.cpp mysqlmon_failover_bad_master mysqlmon_failover_bad_master LABELS mysqlmon REPL_BACKEND)
+# MySQL Monitor switchover with bad master
+add_test_executable(mysqlmon_switchover_bad_master.cpp mysqlmon_switchover_bad_master mysqlmon_switchover_bad_master LABELS mysqlmon REPL_BACKEND)
 
 # MySQL Monitor manual failover with no valid slaves, uses config of mysqlmon_failover_auto
 add_test_executable(mysqlmon_failover_no_slaves.cpp mysqlmon_failover_no_slaves mysqlmon_failover_auto LABELS mysqlmon REPL_BACKEND)
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_bad_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master
similarity index 100%
rename from maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_bad_master
rename to maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master
diff --git a/maxscale-system-test/mysqlmon_failover_bad_master.cpp b/maxscale-system-test/mysqlmon_switchover_bad_master.cpp
similarity index 96%
rename from maxscale-system-test/mysqlmon_failover_bad_master.cpp
rename to maxscale-system-test/mysqlmon_switchover_bad_master.cpp
index ec22b1ddf..b7fbf1a6a 100644
--- a/maxscale-system-test/mysqlmon_failover_bad_master.cpp
+++ b/maxscale-system-test/mysqlmon_switchover_bad_master.cpp
@@ -195,7 +195,8 @@ void run(TestConnections& test)
     expect(test, "server4", "Running");
 
     cout << "\nTrying to do manual switchover to server4" << endl;
-    test.maxscales->execute_maxadmin_command_print(0, (char*)"call command mysqlmon switchover MySQL-Monitor server4 server2");
+    const char* zCommand = "call command mysqlmon switchover MySQL-Monitor server4 server2";
+    test.maxscales->execute_maxadmin_command_print(0, (char*)zCommand);
 
     sleep(8);