diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter b/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter
index 0ac5943e0..3bc8efbf5 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter
@@ -61,16 +61,6 @@ throttling_duration = 10000
 sampling_duration = 250
 continuous_duration = 2000
 
-[Debug-Service]
-type = service
-router = debugcli
-
-[Debug-Listener]
-type = listener
-service = Debug-Service
-protocol = telnetd
-port = 4007
-
 [MaxAdmin-Service]
 type = service
 router = cli
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs722
index fe8ba900b..28a7f72d5 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs722
@@ -43,16 +43,11 @@ type=filter
 module=qlafilter
 filebase=/tmp/QueryLog
 
-[Debug-Interface]
-type=service
-router=debugcli
-
 [RW-Split-Listener]
 type=listener
 service=RW-Split-Router
 protocol=MySQLClient
 port=4006
-#socket=/tmp/rwsplit.sock
 
 [Read-Connection-Listener-Slave]
 type=listener
@@ -66,12 +61,6 @@ service=Read-Connection-Router-Master
 protocol=MySQLClient
 port=4008
 
-[Debug-Listener]
-type=listener
-service=Debug-Interface
-protocol=telnetd
-port=4442
-
 [CLI]
 type=service
 router=cli
@@ -80,7 +69,6 @@ router=cli
 type=listener
 service=CLI
 protocol=maxscaled
-#address=localhost
 socket=default
 
 [server1]