diff --git a/maxscale-system-test/maxtest/src/mariadb_nodes.cc b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
index a9a1c452e..3aeaca796 100644
--- a/maxscale-system-test/maxtest/src/mariadb_nodes.cc
+++ b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
@@ -1175,16 +1175,10 @@ int Mariadb_nodes::configure_ssl(bool require)
 
 int Mariadb_nodes::disable_ssl()
 {
-    int local_result = 0;
-    char str[1024];
-
-    local_result += connect();
-    sprintf(str,
-            "DROP USER %s;  grant all privileges on *.*  to '%s'@'%%' identified by '%s';",
-            user_name,
-            user_name,
-            password);
-    local_result += execute_query(nodes[0], "%s", "");
+    int local_result = connect();
+    local_result += execute_query(
+        nodes[0], "DROP USER %s;  grant all privileges on *.*  to '%s'@'%%' identified by '%s';",
+        user_name, user_name, password);
     close_connections();
 
     for (int i = 0; i < N; i++)
diff --git a/maxscale-system-test/utilities.cmake b/maxscale-system-test/utilities.cmake
index 905c6f203..85548a0f6 100644
--- a/maxscale-system-test/utilities.cmake
+++ b/maxscale-system-test/utilities.cmake
@@ -166,7 +166,7 @@ function(add_test_executable_ex)
     message(FATAL_ERROR "VMS is not set.")
   else()
     # Check that the vms setup is recognized.
-    set(known_vms_setups none repl_backend galera_backend big_repl_backend columnstore_backend second_maxscale)
+    set(known_vms_setups none repl_backend galera_backend big_repl_backend columnstore_backend second_maxscale backend_ssl)
     foreach(elem ${vms_setup})
       list(FIND known_vms_setups ${elem} vms_ind)
       if (vms_ind GREATER -1)