diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index ea37793ff..945bd2beb 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -200,7 +200,7 @@ add_test_executable(maxctrl_basic.cpp maxctrl_basic maxctrl_basic LABELS maxctrl
 add_test_executable(mxs2167_extra_port.cpp mxs2167_extra_port mxs2167_extra_port LABELS REPL_BACKEND)
 
 # Test KILL QUERY functionality
-add_test_executable(kill_query.cpp kill_query replication LABELS REPL_BACKEND)
+add_test_executable(kill_query.cpp kill_query kill_query LABELS REPL_BACKEND)
 
 # MXS-2250: DESCRIBE on temporary table should work.
 add_test_executable(mxs2250_describe_temp_table.cpp mxs2250_describe_temp_table mxs2250_describe_temp_table LABELS REPL_BACKEND)
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.kill_query b/maxscale-system-test/cnf/maxscale.cnf.template.kill_query
new file mode 100755
index 000000000..6eaad58ca
--- /dev/null
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.kill_query
@@ -0,0 +1,28 @@
+[maxscale]
+threads=###threads###
+log_info=1
+
+###server###
+
+[MySQL-Monitor]
+type=monitor
+module=mysqlmon
+servers=###server_line###
+user=maxskysql
+password=skysql
+monitor_interval=1000
+
+[RW-Split-Router]
+type=service
+router=readwritesplit
+servers=###server_line###
+user=maxskysql
+password=skysql
+
+[Read-Connection-Router-Slave]
+type=service
+router=readconnroute
+router_options=slave
+servers=###server_line###
+user=maxskysql
+password=skysql