diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41878409fad868a60165dad88db1295489013cd3..85036bc0c611670f0c720eb3f757563265d05d76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,32 +37,22 @@ image: $CI_REGISTRY_IMAGE:latest
 
 
 stages:
-    - setup
-    - linting
-    - test
-    - deploy
+  - setup
+  - linting
+  - test
+  - deploy
 
-#######
-# setup
-#######
-
-###  TODO !!! use respective docker image
-######
-# test
-######
-
-# run qunit tests
-test:qunit:
+# run qunit tests and pylint
+test:
   tags: [ docker ]
-    stage: test
-    artifacts:
-        paths:
-            - public/qunit.log
-            - screenlog.*
-    script:
-        - make pylint
-# TODO fix the following
-#        - make run-qunit
+  stage: test
+  artifacts:
+    paths:
+      - public/qunit.log
+      - screenlog.*
+  script:
+    - make pylint
+    - make run-qunit
           
 # Trigger building of server image and integration tests
 trigger_build: