diff --git a/test/deps/Makefile b/test/deps/Makefile
index 0570da1f4..90c2bcb34 100644
--- a/test/deps/Makefile
+++ b/test/deps/Makefile
@@ -10,7 +10,7 @@ DEPS_PATH := $(PROXYSQL_PATH)/deps
 default: all
 
 .PHONY: all
-all: mariadb_client mysql_client
+all: mariadb_client mysql_client mysql8_client
 
 
 ### test deps targets
@@ -25,15 +25,6 @@ mariadb-connector-c/mariadb-connector-c/libmariadb/libmariadbclient.a:
 
 mariadb_client: mariadb-connector-c/mariadb-connector-c/libmariadb/libmariadbclient.a
 
-
-#mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a:
-#	cd mysql-connector-c && rm -rf mysql-connector-c-*-src/ || true
-#	cd mysql-connector-c && tar -zxf mysql-connector-c-*-src.tar.gz
-#	cd mysql-connector-c/mysql-connector-c && patch -p0 < ../CMakeLists.txt.patch
-#	cd mysql-connector-c/mysql-connector-c && patch -p0 < ../install_macros.cmake.patch
-#	cd mysql-connector-c/mysql-connector-c && cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl
-#	cd mysql-connector-c/mysql-connector-c && CC=${CC} CXX=${CXX} ${MAKE} mysqlclient mysql
-
 mysql-connector-c/mysql-boost-5.7.44.tar.gz:
 	cd mysql-connector-c && curl -C - -O -s https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-boost-5.7.44.tar.gz || wget -nc -q https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-boost-5.7.44.tar.gz
 
@@ -42,12 +33,25 @@ mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a: mysql-connector-c
 	cd mysql-connector-c && tar -zxf mysql-boost-5.7.*.tar.gz
 	cd mysql-connector-c && ln -fsT $$(ls -1d mysql-5.7.*/) mysql-connector-c
 	cd mysql-connector-c/mysql-connector-c && cmake . -DWITH_BOOST=./boost -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O0 -ggdb -DNDEBUG -fPIC" -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl
-#	cd mysql-connector-c/mysql-connector-c && cmake . -DWITH_BOOST=./boost -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG="-O0 -ggdb -fPIC" -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl
 	cd mysql-connector-c/mysql-connector-c && CC=${CC} CXX=${CXX} ${MAKE} mysqlclient mysql
 	cd mysql-connector-c/mysql-connector-c && cp archive_output_directory/libmysqlclient.a libmysql/
 
 mysql_client: mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a
 
+mysql-connector-c-8.4.0/mysql-8.4.0.tar.gz:
+	cd mysql-connector-c-8.4.0 && curl -C - -O -s https://cdn.mysql.com//Downloads/MySQL-8.4/mysql-8.4.0.tar.gz || wget -nc -q https://cdn.mysql.com//Downloads/MySQL-8.4/mysql-8.4.0.tar.gz
+
+mysql-connector-c-8.4.0/mysql-connector-c/libmysql/libmysqlclient.a: mysql-connector-c-8.4.0/mysql-8.4.0.tar.gz
+	cd mysql-connector-c-8.4.0 && rm -rf mysql-*/ || true
+	cd mysql-connector-c-8.4.0 && tar -zxf mysql-*.tar.gz
+	cd mysql-connector-c-8.4.0 && ln -fsT $$(ls -1d mysql-8.4.*/) mysql-connector-c
+	cd mysql-connector-c-8.4.0/mysql-connector-c && cmake . -DFORCE_INSOURCE_BUILD=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DWITHOUT_SERVER=ON -DDOWNLOAD_BOOST=1 -DWITH_BOOST=./mysql-server/downloads/ -DWITH_UNIT_TESTS=OFF \
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O0 -ggdb -DNDEBUG -fPIC" -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl
+	cd mysql-connector-c-8.4.0/mysql-connector-c && CC=${CC} CXX=${CXX} ${MAKE}
+	cd mysql-connector-c-8.4.0/mysql-connector-c && cp archive_output_directory/libmysqlclient.a libmysql/
+
+mysql8_client: mysql-connector-c-8.4.0/mysql-connector-c/libmysql/libmysqlclient.a
 
 ### clean targets
 
@@ -56,6 +60,7 @@ mysql_client: mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a
 cleanall:
 	cd mariadb-connector-c && rm -rf mariadb-connector-c-*/ || true
 	cd mysql-connector-c && rm -rf mysql-5.7.*/ || true
+	cd mysql-connector-c-8.4.0 && rm -rf mysql-8.4.*/ || true
 
 .PHONY: clean
 .SILENT: clean
@@ -65,3 +70,6 @@ clean:
 	cd mysql-connector-c/mysql-connector-c && $(MAKE) --no-print-directory clean || true
 	cd mysql-connector-c/mysql-connector-c && rm -f CMakeCache.txt || true
 	cd mysql-connector-c/mysql-connector-c && rm -f libmysql/libmysqlclient.a || true
+	cd mysql-connector-c-8.4.0/mysql-connector-c && $(MAKE) --no-print-directory clean || true
+	cd mysql-connector-c-8.4.0/mysql-connector-c && rm -f CMakeCache.txt || true
+	cd mysql-connector-c-8.4.0/mysql-connector-c && rm -f libmysql/libmysqlclient.a || true