diff --git a/pavelib/utils/test/bokchoy_utils.py b/pavelib/utils/test/bokchoy_utils.py
index 224b589457..368a96ea60 100644
--- a/pavelib/utils/test/bokchoy_utils.py
+++ b/pavelib/utils/test/bokchoy_utils.py
@@ -127,8 +127,8 @@ def is_mysql_running():
     """
     # We use the MySQL CLI client and capture its stderr
     # If the client cannot connect successfully, stderr will be non-empty
-    output = os.popen('mysql -e "" 2>&1').read()
-    return output == ""
+    output = os.popen('status mysql 2>&1').read()
+    return output.startswith("mysql start/running, process")
 
 
 def clear_mongo():
diff --git a/scripts/reset-test-db.sh b/scripts/reset-test-db.sh
index a0808c208a..42d8d69e8d 100755
--- a/scripts/reset-test-db.sh
+++ b/scripts/reset-test-db.sh
@@ -24,6 +24,9 @@
 
 DB_CACHE_DIR="common/test/db_cache"
 
+# Ensure the test database exists.
+echo "CREATE DATABASE IF NOT EXISTS test;" | mysql -u root
+
 # Clear out the test database
 ./manage.py lms --settings bok_choy reset_db --traceback --noinput