diff --git a/macro/CMakeLists.txt b/macro/CMakeLists.txt
index 7dc5a22d58e7f454b352ad41ec6018878d2f8fe0..7896b53ef7c42933b351ebfcc35c1d2d4ddd71f1 100644
--- a/macro/CMakeLists.txt
+++ b/macro/CMakeLists.txt
@@ -11,15 +11,13 @@ If(NOT ${CBM_TEST_MODEL} MATCHES Experimental)
   add_subdirectory(field)
   add_subdirectory(C2F)
   add_subdirectory(dimuon)
+  add_subdirectory(PWG)
   Message("Additional Nightly tests")
 EndIf()
 
-  add_subdirectory(PWG)
-
 #--- Additional tests for weekly builds
 If(${CBM_TEST_MODEL} MATCHES Weekly)
   add_subdirectory(KF)
-  add_subdirectory(PWG)
   Message("Additional long running Weekly tests")
 EndIf()
 
diff --git a/macro/PWG/common/production/CMakeLists.txt b/macro/PWG/common/production/CMakeLists.txt
index 8fd67b7d7cb6d8a9334e0862c23b8f5e1c5af9bd..1d8e6396e966bf65272072150bf1d9307ce524e8 100644
--- a/macro/PWG/common/production/CMakeLists.txt
+++ b/macro/PWG/common/production/CMakeLists.txt
@@ -3,7 +3,13 @@
 find_package(Python)
 
 if (Python_FOUND)
-  set(production_macro_events 2)
+  # Define the number of events to run
+  if(LARGE_TEST_STATISTIC OR ${CBM_TEST_MODEL} MATCHES Weekly)
+    Set(production_macro_events 50)
+  else()
+    Set(production_macro_events 2)
+  endif()
+  math(EXPR timeOutTime "300 + (${production_macro_events} * 20)")
 
   GENERATE_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/PWG/common/production/run_json.sh)
 
@@ -18,5 +24,5 @@ if (Python_FOUND)
   Set(testname PWG_common_production_run_json)
 
   Add_Test(${testname} ${CMAKE_CURRENT_BINARY_DIR}/run_json.sh ${CMAKE_CURRENT_BINARY_DIR}/config_ci.json)
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT 600)
+  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT ${timeOutTime})
 endif()