diff --git a/tests/mysql/.test.sh b/tests/mysql/.test.sh
index 29693a293..3717109e5 100755
--- a/tests/mysql/.test.sh
+++ b/tests/mysql/.test.sh
@@ -1,6 +1,14 @@
+set -e
+
 wait_for_port 3306
+
+# Wait for configure-mysql to finish.
+sleep 5
+
 # through unix_socket
 mysql -e 'SELECT VERSION()'
 
 # through tcp/ip
-mysql -h 127.0.0.1 -udb -pdb -e 'SELECT VERSION()'
+mysql -h "127.0.0.1" -udb -pdb -e 'SELECT VERSION()'
+
+ping-mysql
diff --git a/tests/mysql/devenv.nix b/tests/mysql/devenv.nix
index 3c2e4bbe9..0ca449eb7 100644
--- a/tests/mysql/devenv.nix
+++ b/tests/mysql/devenv.nix
@@ -16,4 +16,8 @@
       };
     };
   };
+
+  scripts.ping-mysql.exec = ''
+    $DEVENV_PROFILE/bin/mysqladmin ping
+  '';
 }