diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dc7ecd4ac..f10063da45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,12 +98,21 @@ stages:
     paths:
     - .ccache/
 
-.test: &test_job
+.system_test: &system_test_job
   stage: test
   before_script:
     - bash -x bin/tests/system/ifconfig.sh up
   script:
-    - make -j8 -k check V=1
+    - cd bin/tests && make -j8 -k test V=1
+  artifacts:
+    untracked: true
+    expire_in: '1 week'
+    when: on_failure
+
+.unit_test: &unit_test_job
+  stage: test
+  script:
+    - make unit
   artifacts:
     untracked: true
     expire_in: '1 week'
@@ -155,14 +164,26 @@ build:debian:sid:i386:
   <<: *debian_sid_i386_image
   <<: *build_job
 
-test:debian:sid:amd64:
+unittest:debian:sid:amd64:
   <<: *debian_sid_amd64_image
-  <<: *test_job
+  <<: *unit_test_job
   dependencies:
     - build:debian:sid:amd64
     
-test:debian:sid:i386:
+unittest:debian:sid:i386:
   <<: *debian_sid_i386_image
-  <<: *test_job
+  <<: *unit_test_job
+  dependencies:
+    - build:debian:sid:i386
+
+systemtest:debian:sid:amd64:
+  <<: *debian_sid_amd64_image
+  <<: *system_test_job
+  dependencies:
+    - build:debian:sid:amd64
+    
+systemtest:debian:sid:i386:
+  <<: *debian_sid_i386_image
+  <<: *system_test_job
   dependencies:
     - build:debian:sid:i386