diff --git a/test/docker_mail/tasks/main.yaml b/test/docker_mail/tasks/main.yaml
index d813877b1db93b43a96628a4c69fc19874e9b95b..cdf1905d414d5a54228aee72b39696742bced5e9 100644
--- a/test/docker_mail/tasks/main.yaml
+++ b/test/docker_mail/tasks/main.yaml
@@ -4,6 +4,8 @@
   with_items:
    - { path: "{{ basedir }}/secrets/mailu_secret_key",  length: 32 }
    - { path: "{{ basedir }}/secrets/mailu_admin_pass",  length: 32 }
+   - { path: "{{ basedir }}/secrets/mailu_api_token",  length: 32 }
+   - { path: "{{ basedir }}/secrets/mailu_db_pass",  length: 28 }
    - { path: "{{ basedir }}/secrets/hyperkitty_api_key",  length: 28 }
    - { path: "{{ basedir }}/secrets/mailman_db_pass",  length: 28 }
    - { path: "{{ basedir }}/secrets/mailman_secret_key",  length: 28 }
@@ -25,6 +27,7 @@
   with_items:
     - "{{ basedir }}"
     - "{{ basedir }}/secrets"
+    - "{{ basedir }}/db"
     - "{{ basedir }}/mailu"
     - "{{ basedir }}/mailman-core"
     - "{{ basedir }}/mailman-core/var"
diff --git a/test/docker_mail/templates/docker-compose.yml b/test/docker_mail/templates/docker-compose.yml
index 1c72eeda30480a39db388e995762cc0c9b46987d..4869d3e5c8a26b16bafc20c4ac9fb72e8046dec8 100644
--- a/test/docker_mail/templates/docker-compose.yml
+++ b/test/docker_mail/templates/docker-compose.yml
@@ -177,6 +177,17 @@ services:
     depends_on:
       - front
 
+  db:
+    image: mariadb:10.5
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    volumes:
+      - "{{ basedir }}/db:/var/lib/mysql"
+    environment:
+      - MYSQL_DATABASE=mailudb
+      - MYSQL_USER=mailu
+      - MYSQL_PASSWORD={{ mailu_db_pass }}
+      - MYSQL_ROOT_PASSWORD={{ mysql_root_pass }}
+
   # Additional Services: mailman
   mailman-core:
     container_name: mailman-core
diff --git a/test/docker_mail/templates/mailu.env b/test/docker_mail/templates/mailu.env
index ba57eea1de79c2a365b27662d3769cbb3cea625d..222906810239668fc742f85d87707500d92a5575 100644
--- a/test/docker_mail/templates/mailu.env
+++ b/test/docker_mail/templates/mailu.env
@@ -7,6 +7,12 @@ INITIAL_ADMIN_DOMAIN={{ domain }}
 INITIAL_ADMIN_PW={{ mailu_admin_pass }}
 INITIAL_ADMIN_MODE=ifmissing
 
+###################################
+# Database Settings
+###################################
+
+SQLALCHEMY_DATABASE_URI=mysql://mailu:{{ mailu_db_pass }}@db/mailudb?charset=utf8mb4
+
 ###################################
 # Common configuration variables
 ###################################
@@ -161,4 +167,4 @@ DEFAULT_SPAM_THRESHOLD=80
 
 # API token required for authenticating to the RESTful API.
 # This is a mandatory setting for using the RESTful API.
-API_TOKEN=
+API_TOKEN={{ mailu_api_token }}