diff --git a/test/tap/groups/default/.gitkeep b/test/tap/groups/default/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/tap/groups/gen-groups-json.bash b/test/tap/groups/gen-groups-json.bash
deleted file mode 100755
index 683662e6e..000000000
--- a/test/tap/groups/gen-groups-json.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-# make sure we have correct cwd
-pushd $(dirname $0) > /dev/null
-
-
-GRPS=$(echo $(ls -d */ | tr -d / | awk '{ print "\""$1"\"," }'))
-
-echo "{" > groups.json
-ls -1 ../tests/*-t | sed 's|../tests/||' | awk '{ print "  \""$0"\" : [ \"default\", __GRPS__ ]," }' >> groups.json
-ls -1 ../tests_with_deps/deprecate_eof_support/*-t | sed 's|../tests_with_deps/deprecate_eof_support/||' | awk '{ print "  \""$0"\" : [ \"default\", __GRPS__ ]," }' >> groups.json
-sed -i '$ s/.$//' groups.json
-echo "}" >> groups.json
-sed -i "s/__GRPS__/${GRPS%,}/" groups.json
-
diff --git a/test/tap/groups/gen-groups-sliced-json.bash b/test/tap/groups/gen-groups-sliced-json.bash
deleted file mode 100755
index 1ccef03c2..000000000
--- a/test/tap/groups/gen-groups-sliced-json.bash
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# make sure we have correct cwd
-pushd $(dirname $0) > /dev/null
-
-SLICES=4
-
-GRPS=$(ls -d */ | grep -Pv '\-g\d+' | sort | xargs basename -a)
-TESTS=$(ls -1 ../tests/*-t | sort | xargs basename -a)
-TESTS+=$(ls -1 ../tests_with_deps/deprecate_eof_support/*-t | sort | xargs basename -a)
-
-
-NUM=0
-COUNT=$(echo ${TESTS} | wc -w)
-
-echo "{" > groups.json
-for T in ${TESTS}; do
-	SLICE=$(((NUM/((COUNT/SLICES)+1))+1))
-	G=$(echo "${GRPS}" | xargs -I{} echo -n "\"{}-g${SLICE}\",")
-	echo "  \""$T"\" : [ ${G%,} ]," >> groups.json
-	((NUM++))
-done
-sed -i '$ s/.$//' groups.json
-echo "}" >> groups.json
-
diff --git a/test/tap/groups/mysql-auto_increment_delay_multiplex=0/pre-proxysql.sql b/test/tap/groups/mysql-auto_increment_delay_multiplex=0/pre-proxysql.sql
deleted file mode 100644
index fcd19e67e..000000000
--- a/test/tap/groups/mysql-auto_increment_delay_multiplex=0/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-multiplexing=false/pre-proxysql.sql b/test/tap/groups/mysql-multiplexing=false/pre-proxysql.sql
deleted file mode 100644
index db2c00892..000000000
--- a/test/tap/groups/mysql-multiplexing=false/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-query_digests=0/pre-proxysql.sql b/test/tap/groups/mysql-query_digests=0/pre-proxysql.sql
deleted file mode 100644
index 4203e49f4..000000000
--- a/test/tap/groups/mysql-query_digests=0/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_keep_comment=1/pre-proxysql.sql b/test/tap/groups/mysql-query_digests_keep_comment=1/pre-proxysql.sql
deleted file mode 100644
index 975f759d7..000000000
--- a/test/tap/groups/mysql-query_digests_keep_comment=1/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;