diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index ad59cee31..9af4507a7 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -98,7 +98,7 @@ add_test_executable(bug529.cpp bug529 replication LABELS readwritesplit readconn
 add_test_executable(bug547.cpp bug547 replication LABELS readwritesplit REPL_BACKEND)
 
 # Regression case for the bug "crash if max_slave_connections=10% and 4 or less backends are configured"
-add_test_executable(bug681.cpp bug681 galera.bug681 LABELS readwritesplit GALERA_BACKEND)
+add_test_executable(bug681.cpp bug681 bug681 LABELS readwritesplit REPL_BACKEND)
 
 # Regression case for the bug "crash with tee filter"
 #add_test_executable(bug643.cpp bug643 bug643 LABELS tee REPL_BACKEND)
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 b/maxscale-system-test/cnf/maxscale.cnf.template.bug681
old mode 100755
new mode 100644
similarity index 65%
rename from maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
rename to maxscale-system-test/cnf/maxscale.cnf.template.bug681
index 66b16c237..46e388a16
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug681
@@ -1,39 +1,29 @@
 [maxscale]
 threads=1
-log_warning=1
 
 [MySQL Monitor]
 type=monitor
-module=galeramon
+module=mariadbmon
 servers=server1,server2,server3
-#user=maxmon
-#password=maxpwd
 user=maxskysql
 password=skysql
-root_node_as_master=false
 
 [RW Split Router]
 type=service
 router=readwritesplit
 servers=server1,server2,server3
-#user=maxpriv
-#password=maxpwd
 user=maxskysql
 password=skysql
 filters=MyLogFilter
 version_string=MariaDBEC-10.0.14
 localhost_match_wildcard_host=1
 max_slave_connections=10%
-#max_slave_replication_lag=30
-#slave_selection_criteria=LEAST_BEHIND_MASTER
 
 [Read Connection Router]
 type=service
 router=readconnroute
-router_options=synced
+router_options=master
 servers=server1,server2,server3
-#user=maxpriv
-#password=maxpwd
 user=maxskysql
 password=skysql
 
@@ -46,7 +36,7 @@ port=4009
 [Read Connection Router Slave]
 type=service
 router=readconnroute
-router_options= slave
+router_options=slave
 servers=server1,server2,server3
 user=maxskysql
 password=skysql
@@ -56,14 +46,12 @@ type=listener
 service=RW Split Router
 protocol=MySQLClient
 port=4006
-#socket=/tmp/rwsplit.sock
 
 [Read Connection Listener]
 type=listener
 service=Read Connection Router
 protocol=MySQLClient
 port=4008
-#socket=/tmp/readconn.sock
 
 [CLI]
 type=service
@@ -73,7 +61,6 @@ router=cli
 type=listener
 service=CLI
 protocol=maxscaled
-#address=localhost
 socket=default
 
 [MyLogFilter]
@@ -83,25 +70,19 @@ filebase=/tmp/QueryLog
 
 [server1]
 type=server
-address=###galera_server_IP_1###
-port=###galera_server_port_1###
+address=###node_server_IP_1###
+port=###node_server_port_1###
 protocol=MySQLBackend
 
 [server2]
 type=server
-address=###galera_server_IP_2###
-port=###galera_server_port_2###
+address=###node_server_IP_2###
+port=###node_server_port_2###
 protocol=MySQLBackend
 
 [server3]
 type=server
-address=###galera_server_IP_3###
-port=###galera_server_port_3###
+address=###node_server_IP_3###
+port=###node_server_port_3###
 protocol=MySQLBackend
 
-#[server4]
-#type=server
-#address=###galera_server_IP_4###
-#port=###galera_server_port_4###
-#protocol=MySQLBackend
-