diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 90c754cf3..bc49cc56b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,14 +29,18 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
-      - name: Set up MySQL
+      - name: Set up MySQL for tests
         run: |
           mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "SELECT @@VERSION;"
-          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v
-          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "CREATE USER 'steve'@'%' IDENTIFIED BY 'changeme';" -v
-          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'%';" -v
-          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT SELECT ON mysql.proc TO 'steve'@'%';" -v || true
-          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT SUPER ON *.* TO 'steve'@'%';" -v || true
+          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "CREATE DATABASE $DB_SCHEMA;" -v
+          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PASSWORD';" -v
+          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT ALL PRIVILEGES ON $DB_SCHEMA.* TO '$DB_USER'@'%';" -v
+          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT SELECT ON mysql.proc TO '$DB_USER'@'%';" -v || true
+          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT SUPER ON *.* TO '$DB_USER'@'%';" -v || true
+        env:
+          DB_USER: steve
+          DB_PASSWORD: changeme
+          DB_SCHEMA: stevedb
 
       - name: Build with Maven
         run: ./mvnw -B -V -Dmaven.javadoc.skip=true -Ptest clean package --file pom.xml
diff --git a/src/main/resources/config/test/main.properties b/src/main/resources/config/test/main.properties
index d2c71d3ba..07a49c613 100644
--- a/src/main/resources/config/test/main.properties
+++ b/src/main/resources/config/test/main.properties
@@ -8,9 +8,9 @@ context.path = steve
 #
 db.ip = localhost
 db.port = 3306
-db.schema = stevedb_test_2aa6a783d47d
-db.user = root
-db.password = root
+db.schema = stevedb
+db.user = steve
+db.password = changeme
 
 # Credentials for Web interface access
 #