diff --git a/macro/mcbm/CMakeLists.txt b/macro/mcbm/CMakeLists.txt
index 691260182bf53b1d928f7767b8d319df8afad41a..380f15c0194916712940fa8c08b2d17e27db0141 100644
--- a/macro/mcbm/CMakeLists.txt
+++ b/macro/mcbm/CMakeLists.txt
@@ -35,48 +35,49 @@ ForEach(setup IN LISTS cbm_setup)
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_transport.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\")
   Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
   Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  Set(fixture_digi_event fixture_digi_event_${testname})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_digi_event})
+  Set(fixture_transport fixture_transport_${setup})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_transport})
+
 
   Set(testname mcbm_digi_event_${setup})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_digi.sh ${NumEvents} \"data/${setup}_test\" 0. 0. 1)
   Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
   Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_digi_event})
-  Set(fixture_reco_event fixture_reco_event_${testname})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_reco_event})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_transport})
+  Set(fixture_digi_event fixture_digi_event_${setup})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_digi_event})
 
   Set(testname mcbm_reco_event_${setup})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_reco_event.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\")
   Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
   Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_reco_event})
-  Set(fixture_match_check fixture_match_check_${testname})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_match_check})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_digi_event})
+  Set(fixture_reco_event fixture_reco_event_${setup})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_reco_event})
 
   Set(testname mcbm_match_check_${setup})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_match_check.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\")
   Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
   Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_match_check})
-  Set(fixture_hadron_analysis fixture_hadron_analysis_${testname})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_hadron_analysis})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_reco_event})
+  Set(fixture_match_check fixture_match_check_${setup})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_match_check})
 
   Set(testname mcbm_hadron_analysis_${setup})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_hadron_analysis.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\")
   Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
   Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_hadron_analysis})
-  Set(fixture_digi_tb fixture_digi_tb_${testname})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_digi_tb})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_match_check})
+  Set(fixture_hadron_analysis fixture_hadron_analysis_${setup})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_hadron_analysis})
 
   Set(testname mcbm_digi_${setup})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_digi.sh ${NumEvents} \"data/${setup}_test\")
   Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
   Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_digi_tb})
-  Set(fixture_qa_event_mc fixture_qa_event_mc_${testname})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_qa_event_mc})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_hadron_analysis})
+  Set(fixture_digi_tb fixture_digi_tb_${setup})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_digi_tb})
 
   Set(testname mcbm_qa_event_mc_${setup})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_qa.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\")
@@ -84,9 +85,9 @@ ForEach(setup IN LISTS cbm_setup)
   Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
   Set_Tests_Properties(${testname} PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR")
   Set_Tests_Properties(${testname} PROPERTIES FAIL_REGULAR_EXPRESSION "FATAL")
-  Set_Tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_qa_event_mc})
-  Set(fixture_overlap fixture_overlap_${testname})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_overlap})
+  Set_Tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_digi_tb})
+  Set(fixture_qa_event_mc fixture_qa_event_mc_${setup})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_qa_event_mc})
 
   #Set(testname mcbm_reco_${setup})
   #Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_reco.sh ${NumEvents} ${BeamAngle} \"${setup}\")
@@ -100,16 +101,16 @@ ForEach(setup IN LISTS cbm_setup)
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_check_overlaps.sh \"data/${setup}_test\")
   Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
   Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_overlap})
-  Set(fixture_mcbm_overlap fixture_mcbm_overlap_${testname})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_mcbm_overlap})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_qa_event_mc})
+  Set(fixture_overlap fixture_overlap_${setup})
+  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_overlap})
 
   If( ($ENV{ctest_model} MATCHES Nightly) OR ($ENV{ctest_model} MATCHES Weekly) )
     Set(testname mcbm_check_media_${setup})
     Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/check_media.sh \"data/${setup}_test\")
     Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "60")
     Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-    set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_overlap})
+    set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_overlap})
   EndIf()
 
 EndForEach(setup IN LISTS cbm_setup)