diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 053c029242b2291af05b45e399f48223d96a52dc..f90aff83743531905182b9a1829d5256efdf3869 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
 stages:
+  - test
   - build
   - deploy_to_test
   - deploy_to_production
@@ -18,6 +19,22 @@ docker-build:
 #    - master
 
 
+test-code:
+  image: python:3.10
+  stage: test
+  services:
+    - postgres:14.0
+  variables:
+    POSTGRES_DB: atdb_ldv_ci
+    POSTGRES_USER: atdb_admin_ci
+    POSTGRES_PASSWORD: "atdb123_ci"
+  script:
+    - cd atdb
+    - pip install -r requirements/dev.txt
+    - python manage.py migrate --settings atdb.settings.ci
+    - python manage.py test --settings atdb.settings.ci
+
+
 # deploy to 'sdc-dev.astron.nl'
 docker-deploy-to-test:
   image: docker:latest
diff --git a/atdb/atdb/settings/ci.py b/atdb/atdb/settings/ci.py
new file mode 100644
index 0000000000000000000000000000000000000000..db7459387b6f2b3121f24aac413f91add36cf8f6
--- /dev/null
+++ b/atdb/atdb/settings/ci.py
@@ -0,0 +1,13 @@
+from atdb.settings.base import *
+import os
+
+DATABASES = {
+    'default': {
+         'ENGINE': 'django.db.backends.postgresql_psycopg2',
+         'USER': 'atdb_admin_ci',
+         'PASSWORD': 'atdb123_ci',
+         'NAME': 'atdb_ldv_ci',
+         'HOST': 'localhost',
+         'PORT': '5555',
+    },
+}
\ No newline at end of file
diff --git a/atdb/docker/docker-compose-ci.yml b/atdb/docker/docker-compose-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8e1e6925cb01d58d7d13dff2ec8c2b4e23f4c54d
--- /dev/null
+++ b/atdb/docker/docker-compose-ci.yml
@@ -0,0 +1,15 @@
+version: '3.4'
+
+services:
+  atdb-ldv-db:
+    image: postgres:14
+    container_name: atdb-ldv-ci
+    expose:
+      - "5432"
+    ports:
+      - "5555:5432"
+    environment:
+      POSTGRES_PASSWORD: atdb123_ci
+      POSTGRES_USER: atdb_admin_ci
+      POSTGRES_DB: atdb_ldv_ci
+
diff --git a/atdb/test.bat b/atdb/test.bat
new file mode 100644
index 0000000000000000000000000000000000000000..7651983768db3b208332ccb6ef1d8577f1e4f980
--- /dev/null
+++ b/atdb/test.bat
@@ -0,0 +1 @@
+python manage.py test --settings atdb.settings.ci