diff --git a/VERSION20.cmake b/VERSION20.cmake
deleted file mode 100644
index 8ae109270..000000000
--- a/VERSION20.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# MaxScale version for CMake
-#
-# This file contains cache values for CMake which control MaxScale's version
-# number.
-
-set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
-set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version")
-set(MAXSCALE_VERSION_PATCH "3" CACHE STRING "Patch version")
-
-# This should only be incremented if a package is rebuilt
-set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
-
-set(MAXSCALE_MATURITY "GA" CACHE STRING "Release maturity")
-
-set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
-set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
diff --git a/VERSION21.cmake b/VERSION21.cmake
deleted file mode 100644
index 9b8d3d215..000000000
--- a/VERSION21.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# MaxScale version for CMake
-#
-# This file contains cache values for CMake which control MaxScale's version
-# number.
-
-set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
-set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version")
-set(MAXSCALE_VERSION_PATCH "18" CACHE STRING "Patch version")
-
-# This should only be incremented if a package is rebuilt
-set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
-
-set(MAXSCALE_MATURITY "GA" CACHE STRING "Release maturity")
-
-set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
-set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
diff --git a/VERSION22.cmake b/VERSION22.cmake
deleted file mode 100644
index 84ea47e2e..000000000
--- a/VERSION22.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# MaxScale version for CMake
-#
-# This file contains cache values for CMake which control MaxScale's version
-# number.
-
-set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
-set(MAXSCALE_VERSION_MINOR "2" CACHE STRING "Minor version")
-set(MAXSCALE_VERSION_PATCH "22" CACHE STRING "Patch version")
-
-# This should only be incremented if a package is rebuilt
-set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
-
-set(MAXSCALE_MATURITY "GA" CACHE STRING "Release maturity")
-
-set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
-set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
diff --git a/maxscale-system-test/maxtest/src/mariadb_nodes.cc b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
index d8c9c1947..f1257de54 100644
--- a/maxscale-system-test/maxtest/src/mariadb_nodes.cc
+++ b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
@@ -1252,16 +1252,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 1e4c042bf..2527ebe58 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)