diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48ad6ee8808a5d26159f6bf21f11ed22e64a1c51..e5d21155c265efc958db0630a3647b72f337b20d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,52 +130,28 @@ build:debug-clang:
 
 
 # --- Tests ---
-test:st:exec_cmds: &test
+test:system-tests: &test
   stage: test
   dependencies:
     - build:system-tests
   script:
     - $DUNECONTROL --only=dorie configure
-    - $DUNECONTROL --only=dorie make test_dorie_exec
+    - $DUNECONTROL --only=dorie make system_tests
   artifacts:
     name: "$CI_JOB_NAME"
     paths:
       - $CI_PROJECT_DIR/build-cmake/test
     expire_in: 1 day
 
-test:st:ode:
-  <<: *test
-  script:
-    - $DUNECONTROL --only=dorie configure
-    - $DUNECONTROL --only=dorie make test_run_ode
-
-test:st:parallel:
-  <<: *test
-  tags:
-    - multicore
-  script:
-    - $DUNECONTROL --only=dorie configure
-    - $DUNECONTROL --only=dorie make test_run_parallel
-
-test:st:reference:
-  <<: *test
-  script:
-    - $DUNECONTROL --only=dorie configure
-    - $DUNECONTROL --only=dorie make test_run_ref
-
-test:st:mass_conserve:
-  <<: *test
-  script:
-    - $DUNECONTROL --only=dorie configure
-    - $DUNECONTROL --only=dorie make test_mass_conservation
-
 test:unit-tests:
+  <<: *test
   dependencies:
     - build:unit-tests
   script:
     # install coverage reporter
     - $DUNECONTROL --only=dorie bexec
       "./run-in-dune-env python3 -m pip install gcovr"
+    # perform the tests
     - $DUNECONTROL --only=dorie configure
     - $DUNECONTROL --only=dorie make unit_tests
     # report coverage