diff --git a/bindep.txt b/bindep.txt
index 04cf0c797d..2e9c5e6962 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,9 +1,9 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see http://docs.openstack.org/infra/bindep/ for additional information.
 
-mariadb-client [test !platform:rpm]
-mariadb-server [test]
+mysql-client [test !platform:rpm]
 mysql [test platform:rpm]
+mysql-server [test]
 postgresql [test]
 libjpeg-dev [test !platform:rpm]
 libjpeg-turbo-devel [test platform:rpm]
diff --git a/tools/docker-compose.yaml b/tools/docker-compose.yaml
index 743be69885..05b4905e2e 100644
--- a/tools/docker-compose.yaml
+++ b/tools/docker-compose.yaml
@@ -1,9 +1,9 @@
 version: "3"
 
 services:
-  mariadb:
-    container_name: zuul-test-mariadb
-    image: mariadb:10.6
+  mysql:
+    container_name: zuul-test-mysql
+    image: mysql:8.0
     environment:
       - MYSQL_ROOT_PASSWORD=insecure_worker
     ports:
diff --git a/tools/test-setup-docker.sh b/tools/test-setup-docker.sh
index 6000230bbb..1601b11a7f 100755
--- a/tools/test-setup-docker.sh
+++ b/tools/test-setup-docker.sh
@@ -38,7 +38,7 @@ else
 fi
 
 
-MYSQL="${DOCKER} exec zuul-test-mariadb mysql -u root -pinsecure_worker"
+MYSQL="${DOCKER} exec zuul-test-mysql mysql  -u root -pinsecure_worker"
 
 if [ "${COMPOSE}" == "docker-compose" ]; then
   ${ROOTCMD} docker-compose rm -sf