diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc67d754a..4a48a6362 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ build:
     - make distclean
     - make -j
 
-make-test:
+runtest:
   rules:
     - if: '$COVERAGE'
       when: never
@@ -27,7 +27,55 @@ make-test:
     - git submodule init && git submodule update
     - make distclean
     - make -j
-    - make test -j
+    - ./runtest --config server-threads 3
+
+runtest-cluster:
+  rules:
+    - if: '$COVERAGE'
+      when: never
+    - if: '$ENDURANCE'
+      when: never
+    - when: always
+  tags:
+    - docker
+  stage: test
+  script:
+    - git submodule init && git submodule update
+    - make distclean
+    - make -j
+    - ./runtest-cluster
+
+runtest-moduleapi:
+  rules:
+    - if: '$COVERAGE'
+      when: never
+    - if: '$ENDURANCE'
+      when: never
+    - when: always
+  tags:
+    - docker
+  stage: test
+  script:
+    - git submodule init && git submodule update
+    - make distclean
+    - make -j
+    - ./runtest-moduleapi
+
+runtest-sentinel:
+  rules:
+    - if: '$COVERAGE'
+      when: never
+    - if: '$ENDURANCE'
+      when: never
+    - when: always
+  tags:
+    - docker
+  stage: test
+  script:
+    - git submodule init && git submodule update
+    - make distclean
+    - make -j
+    - ./runtest-sentinel
 
 node-redis-test:
   rules:
@@ -99,7 +147,7 @@ endurance-test:
     - git submodule init && git submodule update
     - make distclean
     - make -j
-    - ./runtest --loop --stop
+    - ./runtest --config server-threads 3 --loop --stop
 
 coverage-test:
   rules: