diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.avro b/maxscale-system-test/cnf/maxscale.cnf.template.avro
index a8593069f..2404559af 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.avro
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.avro
@@ -44,10 +44,12 @@ protocol=MySQLBackend
 [avro-converter]
 type=service
 router=avrorouter
-router_options=binlogdir=/var/lib/maxscale/Binlog_Service,
-        filestem=mar-bin,start_index=1,
-        group_trx=1,group_rows=1,
-        avrodir=/var/lib/maxscale/avro/
+binlogdir=/var/lib/maxscale/Binlog_Service
+filestem=mar-bin
+start_index=1
+group_trx=1
+group_rows=1
+avrodir=/var/lib/maxscale/avro/
 user=skysql
 passwd=skysql
 
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression b/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression
index 1ea65a5ac..ca9f3ce99 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression
@@ -31,10 +31,12 @@ socket=default
 type=service
 router=avrorouter
 codec=deflate
-router_options=binlogdir=/var/lib/maxscale/Binlog_Service,
-        filestem=mar-bin,start_index=1,
-        group_trx=1,group_rows=1,
-        avrodir=/var/lib/maxscale/avro/
+binlogdir=/var/lib/maxscale/Binlog_Service
+filestem=mar-bin
+start_index=1
+group_trx=1
+group_rows=1
+avrodir=/var/lib/maxscale/avro/
 user=skysql
 passwd=skysql