diff --git a/maxscale-system-test/mxs1643_extra_events.cpp b/maxscale-system-test/mxs1643_extra_events.cpp
index 09ebe40fc..a99b58338 100644
--- a/maxscale-system-test/mxs1643_extra_events.cpp
+++ b/maxscale-system-test/mxs1643_extra_events.cpp
@@ -15,8 +15,8 @@ int main(int argc, char** argv)
     execute_query(test.repl->nodes[0], "SET GLOBAL read_only=ON");
     test.maxscales->wait_for_monitor();
     test.tprintf("Check that the current master now has the slave label");
-    test.check_log_err(0, "[Master, Running] -> [Running]", false);
-    test.check_log_err(0, "[Master, Running] -> [Slave, Running]", true);
+    test.check_log_err(0, "[Master, Running] -> [Running]", true);
+    test.check_log_err(0, "[Master, Running] -> [Slave, Running]", false);
     test.maxscales->ssh_node_f(0, true, "truncate -s 0 /var/log/maxscale/maxscale.log");
 
     // Check that the Master and Slave status aren't both set
@@ -24,7 +24,8 @@ int main(int argc, char** argv)
     test.maxscales->wait_for_monitor();
     test.tprintf("Check that the new master doesn't have both slave and master labels");
     test.check_log_err(0, "[Slave, Running] -> [Master, Slave, Running]", false);
-    test.check_log_err(0, "[Slave, Running] -> [Master, Running]", true);
+    test.check_log_err(0, "[Slave, Running] -> [Master, Running]", false);
+    test.check_log_err(0, "[Running] -> [Master, Running]", true);
 
     return test.global_result;
 }
diff --git a/maxscale-system-test/mxs1678_relay_master.cpp b/maxscale-system-test/mxs1678_relay_master.cpp
index 309a56ffc..98b85ce53 100644
--- a/maxscale-system-test/mxs1678_relay_master.cpp
+++ b/maxscale-system-test/mxs1678_relay_master.cpp
@@ -19,6 +19,7 @@ int main(int argc, char** argv)
 
     StringSet master = {"Master", "Running"};
     StringSet slave = {"Slave", "Running"};
+    StringSet running = {"Running"};
     StringSet relay_master = {"Relay Master", "Slave", "Running"};
     StringSet relay_master_only = {"Relay Master", "Running"};
 
@@ -42,8 +43,8 @@ int main(int argc, char** argv)
     free(output);
     test.add_result(test.maxscales->get_server_status("server1") != master, "server1 is not a master");
     test.add_result(test.maxscales->get_server_status( "server2") != slave, "server2 is not a slave");
-    test.add_result(test.maxscales->get_server_status("server3") != relay_master_only, "server3 is not a relay master");
-    test.add_result(test.maxscales->get_server_status("server4") != slave, "server4 is not a slave");
+    test.add_result(test.maxscales->get_server_status("server3") != running, "server3 is not only running");
+    test.add_result(test.maxscales->get_server_status("server4") != running, "server4 is not only running");
 
     test.repl->fix_replication();
     return test.global_result;