diff --git a/system-test/create_user.sh b/system-test/create_user.sh
index 90d4e0475..c331b47ef 100755
--- a/system-test/create_user.sh
+++ b/system-test/create_user.sh
@@ -7,6 +7,8 @@
 
 mysql --force $1 <<EOF >& /dev/null
 
+CREATE DATABASE IF NOT EXISTS test;
+
 DROP USER IF EXISTS '$node_user'@'%';
 CREATE USER '$node_user'@'%' IDENTIFIED BY '$node_password';
 GRANT ALL PRIVILEGES ON *.* TO '$node_user'@'%' $require_ssl WITH GRANT OPTION;
diff --git a/system-test/create_user_galera.sh b/system-test/create_user_galera.sh
index e7eff8738..0cdb78b1d 100755
--- a/system-test/create_user_galera.sh
+++ b/system-test/create_user_galera.sh
@@ -13,6 +13,8 @@ done
 
 mysql --force <<EOF
 
+CREATE DATABASE IF NOT EXISTS test;
+
 DELETE FROM mysql.user WHERE user = '';
 
 DROP USER IF EXISTS '$galera_user'@'%';
diff --git a/system-test/maxtest/src/mariadb_nodes.cc b/system-test/maxtest/src/mariadb_nodes.cc
index 2ce4d396c..3803f3546 100644
--- a/system-test/maxtest/src/mariadb_nodes.cc
+++ b/system-test/maxtest/src/mariadb_nodes.cc
@@ -475,6 +475,7 @@ int Galera_nodes::start_galera()
         ssh_node(i, "echo [mysqld] > cluster_address.cnf", true);
         ssh_node_f(i, true, "echo wsrep_cluster_address=gcomm://%s >>  cluster_address.cnf", gcomm.c_str());
         ssh_node(i, "cp cluster_address.cnf /etc/my.cnf.d/", true);
+        ssh_node(i, "cp cluster_address.cnf /etc/mysql/my.cnf.d/", true);
 
         ssh_node(i, "rm -rf /var/lib/mysql/*", true);
         ssh_node(i, "mysql_install_db --user=mysql", true);
diff --git a/system-test/mdbci/templates/default.json.template b/system-test/mdbci/templates/default.json.template
index 0054e927f..0672547cc 100644
--- a/system-test/mdbci/templates/default.json.template
+++ b/system-test/mdbci/templates/default.json.template
@@ -265,12 +265,17 @@
         "labels" : [
                 "GALERA_BACKEND"
         ],
-        "product" : {
-                "name": "galera",
-                "version": "${galera_version}",
-                "cnf_template" : "galera_server1.cnf",
-                "cnf_template_path": "${cnf_path}"
-        }
+        "products" : [
+                {
+                        "name": "${product}",
+                        "version": "${version}"
+                },
+                {
+                        "name": "galera_config",
+                        "cnf_template" : "galera_server1.cnf"
+                }
+        ],
+        "cnf_template_path": "${cnf_path}"
   },
 
   "galera_001" :
@@ -282,12 +287,17 @@
         "labels" : [
                 "GALERA_BACKEND"
         ],
-        "product" : {
-                "name": "galera",
-                "version": "${galera_version}",
-                "cnf_template" : "galera_server2.cnf",
-                "cnf_template_path": "${cnf_path}"
-        }
+        "products" : [
+                {
+                        "name": "${product}",
+                        "version": "${version}"
+                },
+                {
+                        "name": "galera_config",
+                        "cnf_template" : "galera_server2.cnf"
+                }
+        ],
+        "cnf_template_path": "${cnf_path}"
   },
 
   "galera_002" :
@@ -299,12 +309,17 @@
         "labels" : [
                 "GALERA_BACKEND"
         ],
-        "product" : {
-                "name": "galera",
-                "version": "${galera_version}",
-                "cnf_template" : "galera_server3.cnf",
-                "cnf_template_path": "${cnf_path}"
-        }
+        "products" : [
+                {
+                        "name": "${product}",
+                        "version": "${version}"
+                },
+                {
+                        "name": "galera_config",
+                        "cnf_template" : "galera_server3.cnf"
+                }
+        ],
+        "cnf_template_path": "${cnf_path}"
   },
 
   "galera_003" :
@@ -316,12 +331,17 @@
         "labels" : [
                 "GALERA_BACKEND"
         ],
-        "product" : {
-                "name": "galera",
-                "version": "${galera_version}",
-                "cnf_template" : "galera_server4.cnf",
-                "cnf_template_path": "${cnf_path}"
-        }
+        "products" : [
+                {
+                        "name": "${product}",
+                        "version": "${version}"
+                },
+                {
+                        "name": "galera_config",
+                        "cnf_template" : "galera_server4.cnf"
+                }
+        ],
+        "cnf_template_path": "${cnf_path}"
   },
 
   "maxscale_000" :
diff --git a/system-test/mdbci/templates/performance.json.template b/system-test/mdbci/templates/performance.json.template
deleted file mode 100644
index 8d5652cbd..000000000
--- a/system-test/mdbci/templates/performance.json.template
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-
-###nodes###
-
-  "galera_000" :
-  {
-        "hostname" : "galera000",
-        "box" : "centos_7_libvirt",
-        "memory_size" : "2048",
-        "product" : {
-                "name": "galera",
-                "version": "###galera_version###",
-                "cnf_template" : "galera_server1.cnf",
-                "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf"
-        }
-  },
-
-  "galera_001" :
-  {
-        "hostname" : "galera001",
-        "box" : "centos_7_libvirt",
-        "memory_size" : "2048",
-        "product" : {
-                "name": "galera",
-                "version": "###galera_version###",
-                "cnf_template" : "galera_server2.cnf",
-                "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf"
-        }
-  },
-
-  "galera_002" :
-  {
-        "hostname" : "galera002",
-        "box" : "centos_7_libvirt",
-        "memory_size" : "2048",
-        "product" : {
-                "name": "galera",
-                "version": "###galera_version###",
-                "cnf_template" : "galera_server3.cnf",
-                "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf"
-        }
-  },
-
-  "galera_003" :
-  {
-        "hostname" : "galera003",
-        "box" : "centos_7_libvirt",
-        "memory_size" : "2048",
-        "product" : {
-                "name": "galera",
-                "version": "###galera_version###",
-                "cnf_template" : "galera_server4.cnf",
-                "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf"
-        }
-  },
-
-  "maxscale" :
-  {
-        "hostname" : "maxscale",
-        "box" : "###box###",
-        "memory_size" : "2048",
-        "product" : {
-                "name" : "maxscale_ci",
-                "version" : "${target}"
-        }
-
-  }
-}