diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28c0603bd8fbbbf2094b2a9e76a1fb31b1869024..73637ffccd792e8aa0431df29d6bd9540cf7cc54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,11 +17,13 @@ cache:
 before_script:
   - python -V  # Print out python version for debugging
   - apt-get -qq update
-  - apt-get -qq install -y python3-virtualenv python3 python3-dev python3-pip gettext default-libmysqlclient-dev
+  - apt-get -qq install -y python3-virtualenv python3 python3-dev python3-pip gettext default-mysql-client default-libmysqlclient-dev
   - export DJANGO_SETTINGS_MODULE=AKPlanning.settings_ci
   - ./Utils/setup.sh --prod
+  - mysql --version
 
 test:
   script:
     - source venv/bin/activate
-    - python manage.py test --settings AKPlanning.settings_ci --keepdb
+    - echo "GRANT ALL on *.* to '${MYSQL_USER}';"| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql
+    - python manage.py test --settings AKPlanning.settings_ci
diff --git a/AKPlanning/settings_ci.py b/AKPlanning/settings_ci.py
index 99aa3a7a644abeb993403e35a65b74cdfa87a989..77f75f4ef7c2fcc4a8fa2737e6f196a2a4b58737 100644
--- a/AKPlanning/settings_ci.py
+++ b/AKPlanning/settings_ci.py
@@ -16,10 +16,11 @@ DATABASES = {
         'PASSWORD': 'mysql',
         'OPTIONS': {
             'init_command': "SET sql_mode='STRICT_TRANS_TABLES'",
-            'charset': "utf8mb4",
         },
         'TEST': {
-            'NAME': 'test',
+            'NAME': 'tests',
+            'CHARSET': "utf8mb4",
+            'COLLATION': 'utf8mb4_unicode_ci',
         },
     }
 }