diff --git a/Dockerfile.php7.4 b/Dockerfile.php7.4
index 8e707cd..1f2206b 100644
--- a/Dockerfile.php7.4
+++ b/Dockerfile.php7.4
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index e720d38..961c0b1 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index f2673dc..891cb0a 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 481ac7e..881afc0 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 62f27f4..02c5492 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.4 b/Dockerfile.php8.4
index f340339..525cb21 100644
--- a/Dockerfile.php8.4
+++ b/Dockerfile.php8.4
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
diff --git a/Dockerfile.php8.5 b/Dockerfile.php8.5
index b0716b7..b7c62c1 100644
--- a/Dockerfile.php8.5
+++ b/Dockerfile.php8.5
@@ -38,7 +38,7 @@ RUN curl -fsSL -o /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpuni
 	&& rm /tmp/wp-phpunit.tar.gz
 
 RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && i=0; until mysql -u root -e "SELECT 1" >/dev/null 2>&1; do sleep 1; i=$((i+1)); if [ "$i" -ge 120 ]; then exit 1; fi; done && mysql -u root -e "CREATE DATABASE wordpress"
 
 ENV WP_DEVELOP_DIR=/wp-phpunit
 ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php