diff --git a/maxscale-system-test/mxs1585.cpp b/maxscale-system-test/mxs1585.cpp
index 0738f1225..4351712db 100644
--- a/maxscale-system-test/mxs1585.cpp
+++ b/maxscale-system-test/mxs1585.cpp
@@ -20,9 +20,7 @@ void* query_thr(void* data)
 
         while (running)
         {
-            if (mysql_query(mysql, "SET max_statement_time = 30") ||
-                mysql_query(mysql, "SET sql_log_bin = 0") ||
-                mysql_query(mysql, "INSERT INTO test.mxs1585 VALUES (1)") ||
+            if (mysql_query(mysql, "INSERT INTO test.mxs1585 VALUES (1)") ||
                 mysql_query(mysql, "DELETE FROM test.mxs1585 LIMIT 100"))
             {
                 break;
@@ -68,6 +66,7 @@ int main(int argc, char** argv)
 
     for (auto& a: threads)
     {
+        test.set_timeout(60);
         pthread_join(a, NULL);
     }