diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index 689a9ab933a15151b9a1fce31e62ada72e7b3262..3401054dd62f6a89867931ae4558cb5cc1d123a9 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -307,6 +307,16 @@ If(DEFINED ENV{RAW_DATA_PATH} )
   GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/mcbm2022/mcbm_event.C )  # Event building mCBM 2022
 
   ## Run only if raw data files present: 2021
+  # =====>   Set the timeouts depending on test model (profiling = slow)
+  SET( RAW_DATA_UNPACK_TO 700) # Nightly mode on run4: 298 for run 1588, 525 for 2391, 601 for 2488
+  SET( RAW_DATA_CHECK_TO  600) # Nightly mode on run4: 562 for run 1588
+  SET( RAW_DATA_BUILD_TO  250) # Nightly mode on run4: 155 for 2391, 190 for 2488
+  if(${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile )
+    Message( STATUS "Profiling model detected, increasing timeout for mCBM 2021 tests with coverage." )
+    SET( RAW_DATA_UNPACK_TO 800) # Coverage mode: 716 for run 1588 on run4
+    SET( RAW_DATA_CHECK_TO  800) # Coverage mode: 654 for run 1588 on run4
+  endif()
+  # ====================================================================
   ForEach(RUN 1588 )
     Message( STATUS "Checking if raw data file exists: ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa" )
     If(EXISTS ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa)
@@ -318,12 +328,11 @@ If(DEFINED ENV{RAW_DATA_PATH} )
       Set(fixture_unpacked_${RUN} fixture_done_${testname})
       Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/run/run_unpack_tsa.sh \"${RAW_DATA_PATH}/${RUN}_first20Ts.tsa\" ${RUN})
       Set_Tests_Properties(${testname} PROPERTIES
-            TIMEOUT "600"
+            TIMEOUT ${RAW_DATA_UNPACK_TO}
             FAIL_REGULAR_EXPRESSION "segmentation violation"
             PASS_REGULAR_EXPRESSION "Macro finished successfully"
             FIXTURES_REQUIRED run_cleanup
             FIXTURES_SETUP ${fixture_unpacked_${RUN}}
-            RESOURCE_LOCK mcbm_unpack_disk
             )
 
       ### Raw data analysis tests: time offsets check
@@ -331,7 +340,7 @@ If(DEFINED ENV{RAW_DATA_PATH} )
       Set(fixture_chktime_${RUN} fixture_done_${testname})
       Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2021/check_timing_any.sh \"${CBMROOT_BINARY_DIR}/macro/run/data/${RUN}_first20Ts.digi.root\" ${RUN})
       Set_Tests_Properties(${testname} PROPERTIES
-            TIMEOUT "600"
+            TIMEOUT ${RAW_DATA_CHECK_TO}
             FAIL_REGULAR_EXPRESSION "segmentation violation"
             PASS_REGULAR_EXPRESSION "Macro finished successfully"
             FIXTURES_REQUIRED ${fixture_unpacked_${RUN}}
@@ -341,6 +350,13 @@ If(DEFINED ENV{RAW_DATA_PATH} )
   EndForEach() # ForEach(RUN 1588 )
 
   ## Run only if raw data files present: 2022
+  # =====>   Set the timeouts depending on test model (profiling = slow)
+  if(${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile )
+    Message( STATUS "Profiling model detected, increasing timeout for mCBM 2022 tests with coverage." )
+    SET( RAW_DATA_UNPACK_TO 2200)  # Coverage mode: 1669 for run 2391, 2085 for run 2488
+    SET( RAW_DATA_CHECK_TO   300)  # Coverage mode:  171 for run 2391,  213 for run 2488
+  endif()
+  # ====================================================================
   ForEach(RUN 2391 2488 )
     Message( STATUS "Checking if raw data file exists: ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa" )
     If(EXISTS ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa)
@@ -352,12 +368,11 @@ If(DEFINED ENV{RAW_DATA_PATH} )
       Set(fixture_unpacked_${RUN} fixture_done_${testname})
       Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/run/run_unpack_tsa.sh \"${RAW_DATA_PATH}/${RUN}_first20Ts.tsa\" ${RUN})
       Set_Tests_Properties(${testname} PROPERTIES
-            TIMEOUT "600"
+            TIMEOUT ${RAW_DATA_UNPACK_TO}
             FAIL_REGULAR_EXPRESSION "segmentation violation"
             PASS_REGULAR_EXPRESSION "Macro finished successfully"
             FIXTURES_REQUIRED run_cleanup
             FIXTURES_SETUP ${fixture_unpacked_${RUN}}
-            RESOURCE_LOCK mcbm_unpack_disk
             )
 
       ### Raw data analysis tests: event building and reconstruction => need calibration files!!
@@ -365,7 +380,7 @@ If(DEFINED ENV{RAW_DATA_PATH} )
       Set(fixture_event_${RUN} fixture_done_${testname})
       Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2022/mcbm_event.sh \"${CBMROOT_BINARY_DIR}/macro/run/data/${RUN}_first20Ts.digi.root\" ${RUN})
       Set_Tests_Properties(${testname} PROPERTIES
-            TIMEOUT "600"
+            TIMEOUT ${RAW_DATA_CHECK_TO}
             FAIL_REGULAR_EXPRESSION "segmentation violation"
             PASS_REGULAR_EXPRESSION "Macro finished successfully"
             FIXTURES_REQUIRED ${fixture_unpacked_${RUN}}