diff --git a/maxscale-system-test/mariadb_nodes.cpp b/maxscale-system-test/mariadb_nodes.cpp
index 1a51292a8..909454e0e 100644
--- a/maxscale-system-test/mariadb_nodes.cpp
+++ b/maxscale-system-test/mariadb_nodes.cpp
@@ -340,7 +340,10 @@ int Mariadb_nodes::change_master(int NewMaster, int OldMaster)
             execute_query(nodes[i], "stop slave;");
         }
     }
+    execute_query(nodes[NewMaster], "STOP SLAVE");
+    execute_query(nodes[NewMaster], "RESET SLAVE ALL");
     execute_query(nodes[NewMaster], create_repl_user);
+
     execute_query(nodes[OldMaster], "reset master;");
     find_field(nodes[NewMaster], "show master status", "File", &log_file[0]);
     find_field(nodes[NewMaster], "show master status", "Position", &log_pos[0]);