diff --git a/test/tap/groups/default-g2/pre-proxysql.bash b/test/tap/groups/default-g2/pre-proxysql.bash
deleted file mode 100755
index 19233894b..000000000
--- a/test/tap/groups/default-g2/pre-proxysql.bash
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# change infra config
-# inherits env from tester script
-#
-
-
-# Start ProxySQL Cluster if available
-$JENKINS_SCRIPTS_PATH/cluster_start.bash
-$JENKINS_SCRIPTS_PATH/cluster_init.bash
-
-# wait for cluster to stabilize
-sleep 10
diff --git a/test/tap/groups/default-g3/pre-proxysql.bash b/test/tap/groups/default-g3/pre-proxysql.bash
deleted file mode 100755
index 19233894b..000000000
--- a/test/tap/groups/default-g3/pre-proxysql.bash
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# change infra config
-# inherits env from tester script
-#
-
-
-# Start ProxySQL Cluster if available
-$JENKINS_SCRIPTS_PATH/cluster_start.bash
-$JENKINS_SCRIPTS_PATH/cluster_init.bash
-
-# wait for cluster to stabilize
-sleep 10
diff --git a/test/tap/groups/default-g4/pre-proxysql.bash b/test/tap/groups/default-g4/pre-proxysql.bash
deleted file mode 100755
index 19233894b..000000000
--- a/test/tap/groups/default-g4/pre-proxysql.bash
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# change infra config
-# inherits env from tester script
-#
-
-
-# Start ProxySQL Cluster if available
-$JENKINS_SCRIPTS_PATH/cluster_start.bash
-$JENKINS_SCRIPTS_PATH/cluster_init.bash
-
-# wait for cluster to stabilize
-sleep 10
diff --git a/test/tap/groups/default-g1/pre-proxysql.bash b/test/tap/groups/default/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/default-g1/pre-proxysql.bash
rename to test/tap/groups/default/pre-proxysql.bash
diff --git a/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g2/pre-proxysql.sql b/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g2/pre-proxysql.sql
deleted file mode 100644
index fcd19e67e..000000000
--- a/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g2/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-auto_increment_delay_multiplex=0;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g3/pre-proxysql.sql b/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g3/pre-proxysql.sql
deleted file mode 100644
index fcd19e67e..000000000
--- a/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g3/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-auto_increment_delay_multiplex=0;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g4/pre-proxysql.sql b/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g4/pre-proxysql.sql
deleted file mode 100644
index fcd19e67e..000000000
--- a/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g4/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-auto_increment_delay_multiplex=0;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-auto_increment_delay_multiplex=0-g1/pre-proxysql.sql b/test/tap/groups/mysql-auto_increment_delay_multiplex=0/pre-proxysql.sql
similarity index 100%
rename from test/tap/groups/mysql-auto_increment_delay_multiplex=0-g1/pre-proxysql.sql
rename to test/tap/groups/mysql-auto_increment_delay_multiplex=0/pre-proxysql.sql
diff --git a/test/tap/groups/mysql-multiplexing=false-g2/pre-proxysql.sql b/test/tap/groups/mysql-multiplexing=false-g2/pre-proxysql.sql
deleted file mode 100644
index db2c00892..000000000
--- a/test/tap/groups/mysql-multiplexing=false-g2/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-multiplexing='false';
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-multiplexing=false-g3/pre-proxysql.sql b/test/tap/groups/mysql-multiplexing=false-g3/pre-proxysql.sql
deleted file mode 100644
index db2c00892..000000000
--- a/test/tap/groups/mysql-multiplexing=false-g3/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-multiplexing='false';
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-multiplexing=false-g4/pre-proxysql.sql b/test/tap/groups/mysql-multiplexing=false-g4/pre-proxysql.sql
deleted file mode 100644
index db2c00892..000000000
--- a/test/tap/groups/mysql-multiplexing=false-g4/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-multiplexing='false';
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-multiplexing=false-g1/pre-proxysql.sql b/test/tap/groups/mysql-multiplexing=false/pre-proxysql.sql
similarity index 100%
rename from test/tap/groups/mysql-multiplexing=false-g1/pre-proxysql.sql
rename to test/tap/groups/mysql-multiplexing=false/pre-proxysql.sql
diff --git a/test/tap/groups/mysql-query_digests=0-g2/pre-proxysql.sql b/test/tap/groups/mysql-query_digests=0-g2/pre-proxysql.sql
deleted file mode 100644
index 4203e49f4..000000000
--- a/test/tap/groups/mysql-query_digests=0-g2/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-query_digests=0;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-query_digests=0-g3/pre-proxysql.sql b/test/tap/groups/mysql-query_digests=0-g3/pre-proxysql.sql
deleted file mode 100644
index 4203e49f4..000000000
--- a/test/tap/groups/mysql-query_digests=0-g3/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-query_digests=0;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-query_digests=0-g4/pre-proxysql.sql b/test/tap/groups/mysql-query_digests=0-g4/pre-proxysql.sql
deleted file mode 100644
index 4203e49f4..000000000
--- a/test/tap/groups/mysql-query_digests=0-g4/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-query_digests=0;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-query_digests=0-g1/pre-proxysql.sql b/test/tap/groups/mysql-query_digests=0/pre-proxysql.sql
similarity index 100%
rename from test/tap/groups/mysql-query_digests=0-g1/pre-proxysql.sql
rename to test/tap/groups/mysql-query_digests=0/pre-proxysql.sql
diff --git a/test/tap/groups/mysql-query_digests_keep_comment=1-g2/pre-proxysql.sql b/test/tap/groups/mysql-query_digests_keep_comment=1-g2/pre-proxysql.sql
deleted file mode 100644
index 975f759d7..000000000
--- a/test/tap/groups/mysql-query_digests_keep_comment=1-g2/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-query_digests_keep_comment=1;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-query_digests_keep_comment=1-g3/pre-proxysql.sql b/test/tap/groups/mysql-query_digests_keep_comment=1-g3/pre-proxysql.sql
deleted file mode 100644
index 975f759d7..000000000
--- a/test/tap/groups/mysql-query_digests_keep_comment=1-g3/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-query_digests_keep_comment=1;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-query_digests_keep_comment=1-g4/pre-proxysql.sql b/test/tap/groups/mysql-query_digests_keep_comment=1-g4/pre-proxysql.sql
deleted file mode 100644
index 975f759d7..000000000
--- a/test/tap/groups/mysql-query_digests_keep_comment=1-g4/pre-proxysql.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-# proxysql settings
-SET mysql-query_digests_keep_comment=1;
-LOAD MYSQL VARIABLES TO RUNTIME;
-SAVE MYSQL VARIABLES TO DISK;
diff --git a/test/tap/groups/mysql-query_digests_keep_comment=1-g1/pre-proxysql.sql b/test/tap/groups/mysql-query_digests_keep_comment=1/pre-proxysql.sql
similarity index 100%
rename from test/tap/groups/mysql-query_digests_keep_comment=1-g1/pre-proxysql.sql
rename to test/tap/groups/mysql-query_digests_keep_comment=1/pre-proxysql.sql
diff --git a/test/tap/groups/mysql84-g1/pre-proxysql.bash b/test/tap/groups/mysql84-gr/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql84-g1/pre-proxysql.bash
rename to test/tap/groups/mysql84-gr/pre-proxysql.bash
diff --git a/test/tap/groups/mysql84-gr-g1/pre-proxysql.bash b/test/tap/groups/mysql84/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql84-gr-g1/pre-proxysql.bash
rename to test/tap/groups/mysql84/pre-proxysql.bash
diff --git a/test/tap/groups/mysql90-g1/pre-proxysql.bash b/test/tap/groups/mysql90-gr/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql90-g1/pre-proxysql.bash
rename to test/tap/groups/mysql90-gr/pre-proxysql.bash
diff --git a/test/tap/groups/mysql90-gr-g1/pre-proxysql.bash b/test/tap/groups/mysql90/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql90-gr-g1/pre-proxysql.bash
rename to test/tap/groups/mysql90/pre-proxysql.bash
diff --git a/test/tap/groups/mysql91-g1/pre-proxysql.bash b/test/tap/groups/mysql91-gr/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql91-g1/pre-proxysql.bash
rename to test/tap/groups/mysql91-gr/pre-proxysql.bash
diff --git a/test/tap/groups/mysql91-gr-g1/pre-proxysql.bash b/test/tap/groups/mysql91/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql91-gr-g1/pre-proxysql.bash
rename to test/tap/groups/mysql91/pre-proxysql.bash
diff --git a/test/tap/groups/mysql92-g1/pre-proxysql.bash b/test/tap/groups/mysql92-gr/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql92-g1/pre-proxysql.bash
rename to test/tap/groups/mysql92-gr/pre-proxysql.bash
diff --git a/test/tap/groups/mysql92-gr-g1/pre-proxysql.bash b/test/tap/groups/mysql92/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql92-gr-g1/pre-proxysql.bash
rename to test/tap/groups/mysql92/pre-proxysql.bash
diff --git a/test/tap/groups/mysql93-g1/pre-proxysql.bash b/test/tap/groups/mysql93-gr/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql93-g1/pre-proxysql.bash
rename to test/tap/groups/mysql93-gr/pre-proxysql.bash
diff --git a/test/tap/groups/mysql93-gr-g1/pre-proxysql.bash b/test/tap/groups/mysql93/pre-proxysql.bash
similarity index 100%
rename from test/tap/groups/mysql93-gr-g1/pre-proxysql.bash
rename to test/tap/groups/mysql93/pre-proxysql.bash