diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 14ae750aa7f2f0c8262895c9b64a2a7f6e094d0f..ee4e8683e9a849a2a6bdc6208868e5d82f1f7af7 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,3 +1,3 @@
 FROM debian:stretch
 RUN apt-get update && \
-	apt-get install  curl -y
+	apt-get install curl mariadb-server -y
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec4dfb07f0695f14b1bd952f7f3c6da578de0423..78b09fa3165eed353b9d1859ef46c3a975892404 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,12 +21,11 @@
 
 variables:
   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-mysqlbackend-testenv:latest
-  # When using dind, it's wise to use the overlayfs driver for
-  # improved performance.
 
 image: $CI_REGISTRY_IMAGE
 stages:
   - setup
+  - test
   - deploy
 
 # Trigger building of server image and integration tests
@@ -41,6 +40,13 @@ trigger_build:
       -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
       -F ref=dev https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
 
+unittests:
+  tags: [ docker ]
+  stage: test
+  script:
+    - cp config.defaults .config
+    - make test
+
 # Build a docker image in which tests for this repository can run
 build-testenv:
   tags: [ cached-dind ]