diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout b/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout
index 8486e5244..aa0babaad 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout
@@ -19,7 +19,7 @@ user=maxskysql
 passwd=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
-connection_keepalive=5
+connection_keepalive=1
 
 [Read Connection Router Slave]
 type=service
diff --git a/maxscale-system-test/mxs827_write_timeout.cpp b/maxscale-system-test/mxs827_write_timeout.cpp
index 141a6837b..20b45c496 100644
--- a/maxscale-system-test/mxs827_write_timeout.cpp
+++ b/maxscale-system-test/mxs827_write_timeout.cpp
@@ -22,14 +22,16 @@ int main(int argc, char *argv[])
 
     create_t1(Test->maxscales->conn_rwsplit[0]);
 
-    for (int i = 0; i < 30; i++)
+    Test->tprintf("Doing reads for 30 seconds");
+    time_t start = time(NULL);
+
+    while (time(NULL) - start < 30)
     {
-        Test->tprintf("Trying query %d\n", i);
         Test->set_timeout(10);
         Test->try_query(Test->maxscales->conn_rwsplit[0], "SELECT 1");
-        sleep(1);
     }
 
+    Test->tprintf("Doing one write");
     Test->try_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO t1 VALUES (1, 1)");
 
     Test->check_maxscale_alive(0);