diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index 0f5e76971..d16438fac 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -187,7 +187,7 @@ add_test_executable(bug654.cpp bug654 replication LABELS maxscale REPL_BACKEND)
 add_test_executable(bug658.cpp bug658 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
 
 # Block all backends
-add_test_executable(bug662.cpp bug662 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
+add_test_executable(bug662.cpp bug662 bug662 LABELS readwritesplit readconnroute maxscale REPL_BACKEND)
 
 # Bad TEE filter configuration
 add_test_executable(bug664.cpp bug664 bug664 LABELS MySQLAuth MySQLProtocol)
diff --git a/maxscale-system-test/bug662.cpp b/maxscale-system-test/bug662.cpp
index af7e514f3..a400665c4 100644
--- a/maxscale-system-test/bug662.cpp
+++ b/maxscale-system-test/bug662.cpp
@@ -49,7 +49,8 @@ int main(int argc, char *argv[])
         fflush(stdout);
     }
 
-    Test->set_timeout(100);
+    Test->set_timeout(200);
+    Test->tprintf("Restarting MaxScale");
     Test->restart_maxscale();
 
     Test->set_timeout(20);
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug662 b/maxscale-system-test/cnf/maxscale.cnf.template.bug662
new file mode 100644
index 000000000..6a2a8c10e
--- /dev/null
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug662
@@ -0,0 +1,95 @@
+[maxscale]
+threads=###threads###
+auth_connect_timeout=1
+auth_read_timeout=1
+auth_write_timeout=1
+
+[MySQL Monitor]
+type=monitor
+module=mysqlmon
+###repl51###
+servers=server1,server2,server3,server4
+user=maxskysql
+passwd=skysql
+monitor_interval=1000
+detect_stale_master=false
+backend_connect_timeout=1
+backend_read_timeout=1
+backend_write_timeout=1
+
+[RW Split Router]
+type=service
+router=readwritesplit
+servers=server1,server2,server3,server4
+user=maxskysql
+passwd=skysql
+router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
+max_slave_connections=1
+
+[Read Connection Router Slave]
+type=service
+router=readconnroute
+router_options=slave
+servers=server1,server2,server3,server4
+user=maxskysql
+passwd=skysql
+
+[Read Connection Router Master]
+type=service
+router=readconnroute
+router_options=master
+servers=server1,server2,server3,server4
+user=maxskysql
+passwd=skysql
+
+[RW Split Listener]
+type=listener
+service=RW Split Router
+protocol=MySQLClient
+port=4006
+
+[Read Connection Listener Slave]
+type=listener
+service=Read Connection Router Slave
+protocol=MySQLClient
+port=4009
+
+[Read Connection Listener Master]
+type=listener
+service=Read Connection Router Master
+protocol=MySQLClient
+port=4008
+
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default
+
+[server1]
+type=server
+address=###node_server_IP_1###
+port=###node_server_port_1###
+protocol=MySQLBackend
+
+[server2]
+type=server
+address=###node_server_IP_2###
+port=###node_server_port_2###
+protocol=MySQLBackend
+
+[server3]
+type=server
+address=###node_server_IP_3###
+port=###node_server_port_3###
+protocol=MySQLBackend
+
+[server4]
+type=server
+address=###node_server_IP_4###
+port=###node_server_port_4###
+protocol=MySQLBackend