diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca2a133197..61f1d3e523 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,8 @@ variables:
 stages:
   - precheck
   - build
-  - test
+  - system
+  - unit
   - push
 
 ### Runner Tag Templates
@@ -138,7 +139,7 @@ stages:
 
 .system_test: &system_test_job
   <<: *default_triggering_rules
-  stage: test
+  stage: system
   retry: 2
   before_script:
     - *setup_interfaces
@@ -160,7 +161,7 @@ stages:
 
 .unit_test: &unit_test_job
   <<: *default_triggering_rules
-  stage: test
+  stage: unit
   before_script:
     - *setup_softhsm
   script: