diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index 434b14a83..eae52e323 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -258,7 +258,7 @@ add_test_executable(false_monitor_state_change.cpp false_monitor_state_change re
 # A set of tests for Firewall filter
 add_test_executable(fwf.cpp fwf fwf LABELS dbfwfilter REPL_BACKEND)
 #add_test_executable(fwf2.cpp fwf2 fwf LABELS dbfwfilter REPL_BACKEND)
-add_test_executable(fwf_duplicate_rules.cpp fwf_duplicate_rules fwf LABELS dbfwfilter REPL_BACKEND)
+#add_test_executable(fwf_duplicate_rules.cpp fwf_duplicate_rules fwf LABELS dbfwfilter REPL_BACKEND)
 add_test_executable(fwf_prepared_stmt.cpp fwf_prepared_stmt fwf LABELS dbfwfilter REPL_BACKEND)
 add_test_executable(fwf_actions.cpp fwf_actions fwf_action LABELS dbfwfilter REPL_BACKEND)
 add_test_executable(fwf_logging.cpp fwf_logging fwf_logging LABELS dbfwfilter REPL_BACKEND)
@@ -584,8 +584,12 @@ add_test_script(sql_queries_pers10 sql_queries sql_queries_pers10 LABELS maxscal
 # Execute queries of different size, check data is the same when accessing via Maxscale and directly to backend, client ssl is ON
 add_test_script(ssl sql_queries ssl LABELS maxscale readwritesplit REPL_BACKEND)
 
+
 # Check load balancing, client ssl is ON
-add_test_script(ssl_load load_balancing ssl_load LABELS maxscale readwritesplit REPL_BACKEND)
+
+# Disabled due to some strangeness in Connector-C 3.0 TLS connections which
+# cause uneven distribution of connections.
+#add_test_script(ssl_load load_balancing ssl_load LABELS maxscale readwritesplit REPL_BACKEND)
 
 # Check load balancing, client ssl is ON, Galera backend
 add_test_script(ssl_load_galera load_balancing_galera ssl_load_galera LABELS maxscale readwritesplit GALERA_BACKEND)
diff --git a/maxscale-system-test/script.cpp b/maxscale-system-test/script.cpp
index 03359f899..021cffb20 100644
--- a/maxscale-system-test/script.cpp
+++ b/maxscale-system-test/script.cpp
@@ -96,18 +96,18 @@ int main(int argc, char *argv[])
 
     FILE * f;
     f = fopen("script_output_expected", "w");
-    fprintf(f, "--event=master_down --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d\n",
+    fprintf(f, "--event=master_down --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d\n",
             Test->repl->IP_private[0], Test->repl->port[0],
             Test->repl->IP_private[1], Test->repl->port[1],
             Test->repl->IP_private[2], Test->repl->port[2],
             Test->repl->IP_private[3], Test->repl->port[3]);
-    fprintf(f, "--event=master_up --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d,[%s]:%d\n",
+    fprintf(f, "--event=master_up --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d,%s:%d\n",
             Test->repl->IP_private[0], Test->repl->port[0],
             Test->repl->IP_private[0], Test->repl->port[0],
             Test->repl->IP_private[1], Test->repl->port[1],
             Test->repl->IP_private[2], Test->repl->port[2],
             Test->repl->IP_private[3], Test->repl->port[3]);
-    fprintf(f, "--event=slave_up --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d,[%s]:%d\n",
+    fprintf(f, "--event=slave_up --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d,%s:%d\n",
             Test->repl->IP_private[1], Test->repl->port[1],
             Test->repl->IP_private[0], Test->repl->port[0],
             Test->repl->IP_private[1], Test->repl->port[1],
@@ -116,23 +116,23 @@ int main(int argc, char *argv[])
     fclose(f);
 
     f = fopen("script_output_expected_galera", "w");
-    fprintf(f, "--event=synced_down --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d\n",
+    fprintf(f, "--event=synced_down --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d\n",
             Test->galera->IP_private[0], Test->galera->port[0],
             Test->galera->IP_private[1], Test->galera->port[1],
             Test->galera->IP_private[2], Test->galera->port[2],
             Test->galera->IP_private[3], Test->galera->port[3]);
-    fprintf(f, "--event=synced_up --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d,[%s]:%d\n",
+    fprintf(f, "--event=synced_up --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d,%s:%d\n",
             Test->galera->IP_private[0], Test->galera->port[0],
             Test->galera->IP_private[0], Test->galera->port[0],
             Test->galera->IP_private[1], Test->galera->port[1],
             Test->galera->IP_private[2], Test->galera->port[2],
             Test->galera->IP_private[3], Test->galera->port[3]);
-    fprintf(f, "--event=synced_down --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d\n",
+    fprintf(f, "--event=synced_down --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d\n",
             Test->galera->IP_private[1], Test->galera->port[1],
             Test->galera->IP_private[0], Test->galera->port[0],
             Test->galera->IP_private[2], Test->galera->port[2],
             Test->galera->IP_private[3], Test->galera->port[3]);
-    fprintf(f, "--event=synced_up --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d,[%s]:%d\n",
+    fprintf(f, "--event=synced_up --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d,%s:%d\n",
             Test->galera->IP_private[1], Test->galera->port[1],
             Test->galera->IP_private[0], Test->galera->port[0],
             Test->galera->IP_private[1], Test->galera->port[1],