diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 578045a96d7e1cf04045c755e0ec2a52dbb2b236..93c274a3c4308d5dbd7a77da7649c5add8ef7414 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,10 +68,10 @@ tests:
   services:
     - mariadb
   variables:
-    MYSQL_DATABASE: "tests"
     MYSQL_ROOT_PASSWORD: "R00Tp4ssW0RD"
-    MYSQL_USER: "tests_user"
-    MYSQL_PASSWORD: "password"
+    MYSQL_DATABASE: "test"
+    MYSQL_USER: "castopod"
+    MYSQL_PASSWORD: "castopod"
 
   script:
     - apt-get install -y mariadb-client  libmariadb-dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 156539b2a3925802c40040a808b4fb05ef0a7b9e..667b511edfe816135c498859102a9775936dacf8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,6 +36,7 @@ services:
     ports:
       - 3306:3306
     volumes:
+      - ./initdb:/docker-entrypoint-initdb.d
       - mariadb:/var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: root
diff --git a/initdb/01.sql b/initdb/01.sql
new file mode 100644
index 0000000000000000000000000000000000000000..2429cc61c54e9a10909c7e5b6e4969bb3d78dc8e
--- /dev/null
+++ b/initdb/01.sql
@@ -0,0 +1,2 @@
+CREATE DATABASE IF NOT EXISTS `test`;
+GRANT ALL ON `test`.* TO 'castopod'@'%';
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c6b5aa99f2c86f5e9aacd4ccaee8211134651a8a..7395ebae2c69f44d151b118db311b1db425a9c44 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -46,9 +46,9 @@
 		<const name="PUBLICPATH" value="./public/"/>
 		<!-- Database configuration -->
 		<env name="database.tests.hostname" value="mariadb"/>
-		<env name="database.tests.database" value="tests"/>
-		<env name="database.tests.username" value="tests_user"/>
-		<env name="database.tests.password" value="password"/>
+		<env name="database.tests.database" value="test"/>
+		<env name="database.tests.username" value="castopod"/>
+		<env name="database.tests.password" value="castopod"/>
 		<env name="database.tests.DBDriver" value="MySQLi"/>
 		<env name="database.tests.DBPrefix" value="tests_"/>
 		<env name="REST_API_ENABLED" value="1"/>