diff --git a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h b/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
index 3b978a585..892aff16a 100644
--- a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
+++ b/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
@@ -241,6 +241,13 @@ public:
     // Create the default users used by all tests
     void create_users(int node);
 
+    /**
+     * Create the default users used by all tests on all nodes.
+     *
+     * @return 0 in case of success.
+     */
+    int create_users();
+
     /**
      * Blocks `src` from communicating with `dest`
      */
diff --git a/maxscale-system-test/maxtest/src/mariadb_nodes.cc b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
index 92ac0ad17..9da659bc7 100644
--- a/maxscale-system-test/maxtest/src/mariadb_nodes.cc
+++ b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
@@ -386,6 +386,22 @@ void Mariadb_nodes::create_users(int node)
                user_name, password, access_homedir[0], socket_cmd[0]);
 }
 
+int Mariadb_nodes::create_users()
+{
+    for (int i = 0; i < N; i++)
+    {
+        if (start_node(i, (char*) ""))
+        {
+            printf("Start of node %d failed\n", i);
+            return 1;
+        }
+
+        create_users(i);
+    }
+
+    return 0;
+}
+
 int Mariadb_nodes::start_replication()
 {
     int local_result = 0;
diff --git a/maxscale-system-test/maxtest/src/testconnections.cc b/maxscale-system-test/maxtest/src/testconnections.cc
index 0ee8e72f8..1df01dc04 100644
--- a/maxscale-system-test/maxtest/src/testconnections.cc
+++ b/maxscale-system-test/maxtest/src/testconnections.cc
@@ -554,6 +554,11 @@ TestConnections::~TestConnections()
     {
         repl->disable_ssl();
         // galera->disable_ssl();
+
+        // TODO: Presumably that repl->disable_ssl() call should remove the SSL requirement,
+        // TODO: but that it does not do as any non-SSL test folling will not work.
+        // TODO: Creating the users seems to fix it, so for the time being we do that.
+        repl->create_users();
     }
 
     // stop all Maxscales to detect crashes on exit