diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d521140cbf6f2fdd724d8f9ba132338eda9d52c4..83c655c432c5f15491a40daa873e86a8dd8928c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -218,7 +218,6 @@ CbmRoot_Merge_macosx:
     - echo "export BUILDDIR=$PWD/build" >> Dart.cfg
     - echo "export SOURCEDIR=$PWD" >> Dart.cfg
     - echo "export NCPU=4" >> Dart.cfg
-    - echo "export PATH=\$SIMPATH/bin:$PATH" >> Dart.cfg
     - ls
     - pwd
     - cat Dart.cfg
@@ -252,7 +251,7 @@ CbmRoot_Merge_realData:
     - echo "export BUILDDIR=$PWD/build" >> Dart.cfg
     - echo "export SOURCEDIR=$PWD" >> Dart.cfg
     - echo "export NCPU=16" >> Dart.cfg
-    - echo "export PATH=\$SIMPATH/bin:$PATH" >> Dart.cfg
+    - echo "export PATH=/opt/cmake/3.20.1/bin:$PATH" >> Dart.cfg
     - ls
     - pwd
     - cat Dart.cfg
diff --git a/CbmRoot_test.cmake b/CbmRoot_test.cmake
index 5eb374c6a0346a95044533e8e33dd13e65ed3f34..77819779a20d6f5305982aff8517ae5c4e8cb1d2 100644
--- a/CbmRoot_test.cmake
+++ b/CbmRoot_test.cmake
@@ -85,7 +85,11 @@ EndIf()
 
 Ctest_Start($ENV{ctest_model})
 
+unset(repeat)
 If($ENV{ctest_model} MATCHES Continuous)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
+    set(repeat REPEAT UNTIL_PASS:2)
+  endif()
   set(ENV{ctest_model} Nightly)
 EndIf()
 
@@ -111,6 +115,7 @@ If(NOT _RETVAL)
 
   Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}"
              PARALLEL_LEVEL $ENV{number_of_processors}
+             ${repeat}
              RETURN_VALUE _ctest_test_ret_val
             )