diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index 9908a6135..b2798cb78 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -546,7 +546,7 @@ add_test_executable(rwsplit_multi_stmt.cpp rwsplit_multi_stmt rwsplit_multi_stmt
 add_test_executable(rwsplit_read_only_trx.cpp rwsplit_read_only_trx rwsplit_read_only_trx LABELS readwritesplit REPL_BACKEND)
 
 # Test replication-manager with MaxScale
-add_test_executable(replication_manager.cpp replication_manager replication_manager LABELS maxscale REPL_BACKEND)
+#add_test_executable(replication_manager.cpp replication_manager replication_manager LABELS maxscale REPL_BACKEND)
 #add_test_executable_notest(replication_manager_2nodes.cpp replication_manager_2nodes replication_manager_2nodes LABELS maxscale REPL_BACKEND)
 #add_test_executable_notest(replication_manager_3nodes.cpp replication_manager_3nodes replication_manager_3nodes LABELS maxscale REPL_BACKEND)
 
diff --git a/maxscale-system-test/mxs1323_stress.cpp b/maxscale-system-test/mxs1323_stress.cpp
index f20275144..efae35e66 100644
--- a/maxscale-system-test/mxs1323_stress.cpp
+++ b/maxscale-system-test/mxs1323_stress.cpp
@@ -16,7 +16,7 @@ void* async_query(void* data)
     {
         MYSQL* conn = test->open_rwsplit_connection();
 
-        for (int i = 0; i < 50; i++)
+        for (int i = 0; i < 50 && running && test->global_result == 0; i++)
         {
             const char* query = "SET @a = (SELECT SLEEP(1))";
             test->try_query(conn, query);