diff --git a/.gitlab/common.yml b/.gitlab/common.yml
index 91d5ee17218b2aaa4c343d8d169ad778ee6901b5..ed1c1b3a38318ef8846b1f3aa8dac4997a6a1fbf 100644
--- a/.gitlab/common.yml
+++ b/.gitlab/common.yml
@@ -36,8 +36,7 @@
        cmake -C ../cmake_modules/gitlab-ci-initial-cache.cmake .. $BUILD_OPTIONS &&
        scan-build -plist --intercept-first --exclude CMakeFiles --analyze-headers -o analyzer_reports
        ctest --no-compress-output -V -j 5
-             -D ExperimentalBuild
-             -D ExperimentalSubmit
+             -T Build
              | tee ../${LOGNAME})
     - (cd build-$VERSION &&
        make install | tee -a ../${LOGNAME} &&
@@ -59,9 +58,8 @@
     - (cd build-$VERSION &&
        eval "ctest --no-compress-output -V
              $TESTS_RESTRICTION
-             -D ExperimentalTest
-             -D ExperimentalCoverage
-             -D ExperimentalSubmit
+             -T Test
+             -T Coverage
              | tee -a ../${LOGNAME}.log")
     - lcov --directory build-$VERSION --capture --output-file ./${LOGNAME}.lcov
     - (cd build-$VERSION && lcov --directory . --capture --output-file ../bis_${LOGNAME}.lcov)
diff --git a/.gitlab/test_starpu.yml b/.gitlab/test_starpu.yml
index 492c5fad1395c5b35b21e3e58725e750748d423e..ecbb2a0ef9a9a94eaffd4ac3370e4055ca90b85c 100644
--- a/.gitlab/test_starpu.yml
+++ b/.gitlab/test_starpu.yml
@@ -104,6 +104,5 @@ test_starpu_shm_s_macosx:
     VERSION: starpu
   script:
     - cd build-starpu && ctest -V -R test_shm_s
-                               -D ExperimentalTest
-                               -D ExperimentalCoverage
-                               -D ExperimentalSubmit
+                               -T Test
+                               -T Coverage