diff --git a/maxscale-system-test/maxtest/src/testconnections.cc b/maxscale-system-test/maxtest/src/testconnections.cc
index 6b236e8b2..991732578 100644
--- a/maxscale-system-test/maxtest/src/testconnections.cc
+++ b/maxscale-system-test/maxtest/src/testconnections.cc
@@ -491,6 +491,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