diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index 87c048057dca30cb34962d67668a857c17b3f162..b08940c81f954ea73d747240ff043f3ac7493e1d 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -235,8 +235,8 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-	FIXTURES_REQUIRED "fixt_tra_${setup}_coll;fixt_digi_ts_${setup};fixt_reco_ts_${setup}_eb_real"
-	FIXTURES_SETUP fixt_${setup}_qa
+	FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_real_${setup}"
+	FIXTURES_SETUP fixt_qa_${setup}
  	RESOURCE_LOCK collParDb_${setup}
   )
 
diff --git a/macro/run/run_qa.C b/macro/run/run_qa.C
index 95430ed14600af918c78ab8052075d8f5da28a57..9104e8c149577f1a19c59f9ce119c87ddeabb605 100644
--- a/macro/run/run_qa.C
+++ b/macro/run/run_qa.C
@@ -166,8 +166,26 @@ void run_qa(TString dataTra = "data/sis100_muon_jpsi_test", TString dataRaw = "d
     run->AddTask(new CbmMuchHitFinderQa());
   }
 
+  // ----- TRD QA  ---------------------------------
+  if (CbmSetup::Instance()->IsActive(ECbmModuleId::kTrd)) {
+    run->AddTask(new CbmTrdMCQa());
+    //run->AddTask(new CbmTrdHitRateQa());  //opens lots of windows
+    //run->AddTask(new CbmTrdDigitizerPRFQa()); //works put currently doesn't do anything
+    //run->AddTask(new CbmTrdHitRateFastQa());  //opens lots of windows
+    run->AddTask(new CbmTrdHitProducerQa());  //Histograms currently don't appear in output file
+  }
+  // ------------------------------------------------------------------------
+
   // ----- STS QA  ---------------------------------
-  if (CbmSetup::Instance()->IsActive(ECbmModuleId::kSts)) { run->AddTask(new CbmStsFindTracksQa()); }
+  if (CbmSetup::Instance()->IsActive(ECbmModuleId::kSts)) {
+    //run->AddTask(new CbmStsDigitizeQa()); //opens lots of windows
+    run->AddTask(new CbmStsFindTracksQa());
+  }
+  // ------------------------------------------------------------------------
+
+  // ----- Event builder QA  ---------------------------------
+  CbmBuildEventsQa* evBuildQA = new CbmBuildEventsQa();
+  run->AddTask(evBuildQA);
   // ------------------------------------------------------------------------
 
   // -----  Parameter database   --------------------------------------------
diff --git a/reco/detectors/sts/qa/CbmStsFindTracksQa.h b/reco/detectors/sts/qa/CbmStsFindTracksQa.h
index c7037d77f55785d60f9babfa9cc2e58364a5c467..4ee2f291fb3bfdfe6fbf0259d38cdfd2d18ddf10 100644
--- a/reco/detectors/sts/qa/CbmStsFindTracksQa.h
+++ b/reco/detectors/sts/qa/CbmStsFindTracksQa.h
@@ -146,7 +146,7 @@ private:
 
   Double_t fQuota = 0.7;  // True/all hits for track to be considered reconstructed
 
-  TFolder fOutFolder = {"CbmStsFindTracksQa", "CbmStsFindTracksQa"};  /// output folder with histos and canvases
+  TFolder fOutFolder = {"StsFindTracksQA", "StsFindTracksQA"};  /// output folder with histos and canvases
 
   /** Histograms **/
 
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx b/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
index 7d50671edf5126dfdf043b5ac258803fc15ae058..e1fe90ce58f7bfaea8d76c77bbe33d0576de74d5 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
@@ -279,6 +279,9 @@ void CbmTrdHitProducerQa::PrepareHistograms()
 
 void CbmTrdHitProducerQa::WriteHistograms()
 {
+  gDirectory->mkdir("TrdHitProducerQA");
+  gDirectory->cd("TrdHitProducerQA");
+
   if (fHitPoolsX) fHitPoolsX->Write();
   if (fHitPoolsY) fHitPoolsY->Write();
 
@@ -295,6 +298,8 @@ void CbmTrdHitProducerQa::WriteHistograms()
   if (S3L4edEall) S3L4edEall->Write();
   if (S3L4pidE15) S3L4pidE15->Write();
   if (S3L4pidEall) S3L4pidEall->Write();
+
+  gDirectory->cd("..");
 }
 
 // --------------------------------------------------------------------------
diff --git a/sim/detectors/trd/qa/CbmTrdMCQa.cxx b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
index 735c467634a92a69d057d2fdff2289371024fa5a..dd697d547d39b5b9221e6dfcd547267aae49f6bb 100644
--- a/sim/detectors/trd/qa/CbmTrdMCQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
@@ -174,10 +174,10 @@ void CbmTrdMCQa::Finish()
     fHM->Scale(Form("h_trd_PointsMapRate_Station%i", i), 10000000. * scale / nofEvents);
   }
 
-  gDirectory->mkdir("QA/TrdMCQa");
-  gDirectory->cd("QA/TrdMCQa");
+  gDirectory->mkdir("TrdMcQA");
+  gDirectory->cd("TrdMcQA");
   fHM->WriteToFile();
-  gDirectory->cd("../..");
+  gDirectory->cd("..");
   //    CbmSimulationReport* report = new CbmTrdMCQaReport(fSetup, fDigitizer);
   //    report -> Create(fHM, fOutputDir);
   //    delete report;