diff --git a/maxscale-system-test/bug705.cpp b/maxscale-system-test/bug705.cpp
index ec11bd5b5..63b28dcfc 100644
--- a/maxscale-system-test/bug705.cpp
+++ b/maxscale-system-test/bug705.cpp
@@ -242,15 +242,9 @@ int main(int argc, char *argv[])
 
     Test->tprintf("Restarting MaxScale\n");
 
-    Test->set_timeout(100);
+    Test->set_timeout(120);
     Test->restart_maxscale();
 
-    Test->stop_maxscale();
-    Test->stop_timeout();
-    Test->tprintf("Waiting 20 seconds\n");
-    sleep(20);
-
-    Test->set_timeout(60);
     Test->check_log_err((char *) "Loading database names", false);
     Test->check_log_err((char *) "Unknown column", false);
 
diff --git a/maxscale-system-test/kerberos_setup.cpp b/maxscale-system-test/kerberos_setup.cpp
index 814d734ec..41946f5cb 100644
--- a/maxscale-system-test/kerberos_setup.cpp
+++ b/maxscale-system-test/kerberos_setup.cpp
@@ -138,6 +138,11 @@ int main(int argc, char *argv[])
                              "echo select User,Host from mysql.user | mysql -uusr1 -h maxscale.maxscale.test -P 4009", false),
         "Error executing query against Read Connection Slave\n");
 
+    for (int i = 0; i < Test->repl->N; i++)
+    {
+        Test->repl->ssh_node(i, "sudo rm -f /etc/my.cnf.d/kerb.cnf", true);
+    }
+
     int rval = Test->global_result;
     delete Test;
     return rval;
diff --git a/maxscale-system-test/mariadb_nodes.cpp b/maxscale-system-test/mariadb_nodes.cpp
index cd21436af..8c165e991 100644
--- a/maxscale-system-test/mariadb_nodes.cpp
+++ b/maxscale-system-test/mariadb_nodes.cpp
@@ -433,7 +433,6 @@ int Mariadb_nodes::start_replication()
                 "mysql -u root %s -e \"STOP SLAVE; RESET SLAVE; RESET SLAVE ALL; RESET MASTER; SET GLOBAL read_only=OFF;\"",
                 socket_cmd[i]);
         ssh_node(i, str, true);
-        ssh_node(i, "sudo rm -f /etc/my.cnf.d/kerb.cnf", true);
     }
 
     sprintf(str, "%s/create_user.sh", test_dir);
diff --git a/maxscale-system-test/mxs922_restart.cpp b/maxscale-system-test/mxs922_restart.cpp
index a991734ab..1ccca79d5 100644
--- a/maxscale-system-test/mxs922_restart.cpp
+++ b/maxscale-system-test/mxs922_restart.cpp
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 
     test->tprintf("Restarting MaxScale");
     test->restart_maxscale();
-    sleep(10);
+    sleep(2);
 
     do_query(test, false);
 
diff --git a/maxscale-system-test/mxs951_utfmb4.cpp b/maxscale-system-test/mxs951_utfmb4.cpp
index c29fa0d8f..f1950e6de 100644
--- a/maxscale-system-test/mxs951_utfmb4.cpp
+++ b/maxscale-system-test/mxs951_utfmb4.cpp
@@ -46,10 +46,7 @@ int main(int argc, char *argv[])
     Test->tprintf("Restart Maxscale");
     Test->restart_maxscale();
 
-    sleep(10);
-
     Test->check_maxscale_alive();
-    //Test->check_maxscale_processes(0);
 
     Test->stop_timeout();
     Test->tprintf("Restore backend configuration\n");