diff --git a/test/tap/groups/default-g1/.gitkeep b/test/tap/groups/default-g1/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/tap/groups/default-g1/pre-proxysql.bash b/test/tap/groups/default-g1/pre-proxysql.bash
new file mode 100644
index 000000000..19233894b
--- /dev/null
+++ b/test/tap/groups/default-g1/pre-proxysql.bash
@@ -0,0 +1,13 @@
+#!/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-g2/.gitkeep b/test/tap/groups/default-g2/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/tap/groups/default-g2/pre-proxysql.bash b/test/tap/groups/default-g2/pre-proxysql.bash
new file mode 100644
index 000000000..19233894b
--- /dev/null
+++ b/test/tap/groups/default-g2/pre-proxysql.bash
@@ -0,0 +1,13 @@
+#!/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/.gitkeep b/test/tap/groups/default-g3/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/tap/groups/default-g3/pre-proxysql.bash b/test/tap/groups/default-g3/pre-proxysql.bash
new file mode 100644
index 000000000..19233894b
--- /dev/null
+++ b/test/tap/groups/default-g3/pre-proxysql.bash
@@ -0,0 +1,13 @@
+#!/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/.gitkeep b/test/tap/groups/default-g4/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/tap/groups/default-g4/pre-proxysql.bash b/test/tap/groups/default-g4/pre-proxysql.bash
new file mode 100644
index 000000000..19233894b
--- /dev/null
+++ b/test/tap/groups/default-g4/pre-proxysql.bash
@@ -0,0 +1,13 @@
+#!/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