diff --git a/algo/test/CMakeLists.txt b/algo/test/CMakeLists.txt
index e4ab499ebf3eaa0f0ea2a5e4913345af09e5e405..ae3ec027dba4c1f9f5dc97665ad7f23113d7b16c 100644
--- a/algo/test/CMakeLists.txt
+++ b/algo/test/CMakeLists.txt
@@ -26,17 +26,37 @@ AddBasicTest(_GTestChannelMapping)
 
 if (DEFINED ENV{RAW_DATA_PATH})
   set(RAW_DATA_PATH $ENV{RAW_DATA_PATH})
+  set(RUN 2391)
 
   set(TEST_SCRIPT ${CMAKE_SOURCE_DIR}/algo/test/realdata_test.sh)
   set(RECO_BIN ${EXECUTABLE_OUTPUT_PATH}/cbmreco)
   set(PARAMS_DIR ${CMAKE_SOURCE_DIR}/parameters/online)
-  set(TSA_FILE ${RAW_DATA_PATH}/2391_first20Ts.tsa)
+  set(TSA_FILE ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa)
+
+  # FIXME: for now the wrapper/log checker script hard-codes the TS number to 1
+  #        and would always succed if 1st TS passed !!!!!
+  # FIXME: This test seems to need 45s during the MR CI but more than 600 during the Nightly/Weekly tests!!
+  if(${CBM_TEST_MODEL} MATCHES MergeRequest OR ${CBM_TEST_MODEL} MATCHES Continuous )
+    Message( STATUS "MR or Continuous model detected, decreasing TS nb for OnlineReco tests to single one." )
+    SET( RECO_TS_NB 1)
+    SET( ONLINE_RECO_TO 100) # MR mode on run4: 45-50s for 2391
+  elseif(${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile )
+    Message( STATUS "Profiling model detected, increasing timeout and TS nb for OnlineReco tests with coverage." )
+    SET( RECO_TS_NB 20)
+    SET( ONLINE_RECO_TO 1600) # Coverage mode for run 2391: ???? on run4, ???? on virgo3
+  else()
+    SET( RECO_TS_NB 3)
+    SET( ONLINE_RECO_TO  800) # Nightly mode on run4: ??? for 2391
+  endif()
 
   Add_Test(
     NAME OnlineRecoCanProcessTimeslice
-    COMMAND ${TEST_SCRIPT} ${RECO_BIN} ${PARAMS_DIR} ${TSA_FILE}
+    COMMAND ${TEST_SCRIPT} ${RECO_BIN} ${PARAMS_DIR} ${TSA_FILE} ${RECO_TS_NB}
   )
 
-  set_tests_properties(OnlineRecoCanProcessTimeslice PROPERTIES TIMEOUT 600)
+  set_tests_properties(OnlineRecoCanProcessTimeslice PROPERTIES
+    TIMEOUT ${ONLINE_RECO_TO}
+    RESOURCE_LOCK tsa_file_${RUN} # Needed to avoid access collision with offline unpacker
+  )
 
 endif()
diff --git a/macro/PWG/common/production/CMakeLists.txt b/macro/PWG/common/production/CMakeLists.txt
index b363e1edae513e0093f3243caea1690b1fd3461f..0f5645d6b562c852db9d9170c53b06a9db85e7a7 100644
--- a/macro/PWG/common/production/CMakeLists.txt
+++ b/macro/PWG/common/production/CMakeLists.txt
@@ -9,7 +9,7 @@ if (Python_FOUND)
   else()
     Set(production_macro_events 2)
   endif()
-  math(EXPR timeOutTime "300 + (${production_macro_events} * 150)")
+  math(EXPR timeOutTime "400 + (${production_macro_events} * 150)")
 
   cmake_host_system_information(RESULT local_host_name QUERY HOSTNAME)
   if(${CBM_TEST_MODEL} MATCHES Weekly AND ${local_host_name} MATCHES "^(lxbk)" AND 5400 LESS ${timeOutTime})
diff --git a/macro/beamtime/mcbm2024/CMakeLists.txt b/macro/beamtime/mcbm2024/CMakeLists.txt
index b24b12aa7ff6da5e518763d2862666be336a8583..99eb9954c6a9c0998367e1f7a8d18bf6a4bc40c4 100644
--- a/macro/beamtime/mcbm2024/CMakeLists.txt
+++ b/macro/beamtime/mcbm2024/CMakeLists.txt
@@ -95,6 +95,7 @@ If(DEFINED ENV{RAW_DATA_PATH} )
             PASS_REGULAR_EXPRESSION "Reconstruction of ${RAW_DATA_PATH}/${RUN}_first20Ts.tsa succeeded\n"
             FIXTURES_REQUIRED mcbm_2024_cleanup
             FIXTURES_SETUP ${fixture_unp_${RUN}}
+            RESOURCE_LOCK tsa_file_${RUN} # Needed to avoid access collision with eventual online unpacker tests
             )
 
       Set(testname mcbm_2024_rec_${RUN})
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index 7bffb48d74afb36c58145ff2f52f2ea837b2907f..7bbcbeccc9565d0598395081812e855594535c93 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -491,6 +491,7 @@ If(DEFINED ENV{RAW_DATA_PATH} )
             PASS_REGULAR_EXPRESSION "Macro finished successfully"
             FIXTURES_REQUIRED run_cleanup
             FIXTURES_SETUP ${fixture_unpacked_${RUN}}
+            RESOURCE_LOCK tsa_file_${RUN} # Needed to avoid access collision with eventual online unpacker tests
             )
 
       ### Raw data analysis tests: event building and reconstruction => need calibration files!!