diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
index f02fd4c7483dec70276bd47e9a7db5422aef16bf..33a7943e29a2d32dc87c91ce353ebd53d3f55295 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
@@ -51,9 +51,10 @@ recoPreExec = ' '.join([
   "AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);",
   "AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);",
   # Trigger flags
+  "from AthenaConfiguration.AllConfigFlags import ConfigFlags;",
+  "ConfigFlags.Trigger.triggerMenuSetup=\'{:s}\';".format(menu_name),
   "from TriggerJobOpts.TriggerFlags import TriggerFlags;",
   "TriggerFlags.configForStartup=\'HLToffline\';",
-  "TriggerFlags.triggerMenuSetup=\'{:s}\';".format(menu_name),
   "TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
   "TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\');"])
 reco = ExecStep.ExecStep('Tier0Reco')
diff --git a/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py b/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
index d1fb5984fa7dc7da03a6f9e98d276adeded82b3d..646180b431bad4da4b4d37eed953d2fac0eac9e9 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
+++ b/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
@@ -15,6 +15,7 @@ from TriggerMenuMT.HLTMenuConfig.CommonSequences import EventBuildingSequenceSet
 from TrigPartialEventBuilding.TrigPartialEventBuildingConfig import StaticPEBInfoWriterToolCfg, RoIPEBInfoWriterToolCfg
 from TriggerJobOpts.TriggerFlags import TriggerFlags
 from libpyeformat_helper import SubDetector
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaCommon.AlgSequence import dumpSequence
 from AthenaCommon.Logging import logging
 log = logging.getLogger('dataScoutingTest')
@@ -142,7 +143,7 @@ myAllStreams = [
 StreamInfo._all_streams = myAllStreams
 
 # Set trigger flags
-TriggerFlags.triggerMenuSetup = 'LS2_v1'
+ConfigFlags.Trigger.triggerMenuSetup = TriggerFlags.triggerMenuSetup = 'LS2_v1'
 TriggerFlags.Slices_all_setOff()
 TriggerFlags.EgammaSlice.setAll()
 TriggerFlags.MuonSlice.setAll()
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
index a854bae5cc8e33dd618065737605d573d972aee8..1ca2db917dc4604f6b683bfccbd6c1ef1d469a4d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
@@ -24,9 +24,10 @@ hlt.input = 'data'
 #====================================================================================================
 # Tier-0 reco step BS->ESD->AOD
 tzrecoPreExec = ' '.join([
+ "from AthenaConfiguration.AllConfigFlags import ConfigFlags;",
+ "ConfigFlags.Trigger.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
  "from TriggerJobOpts.TriggerFlags import TriggerFlags;",
  "TriggerFlags.configForStartup=\'HLToffline\';",
- "TriggerFlags.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
  "TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
  "TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\')",
 ])
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
index 2e653ce39fa6933d25fe0cdc9761966727a94e4a..4d59af68a3b0720118b11208e3d27b03b03c1f7c 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
@@ -30,9 +30,10 @@ filter_bs.args = '-s Main ' + findFile('*_HLTMPPy_output.*.data')
 
 # Tier-0 reco step (BS->ESD->AOD)
 tzrecoPreExec = ' '.join([
+  "from AthenaConfiguration.AllConfigFlags import ConfigFlags;",
+  "ConfigFlags.Trigger.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
   "from TriggerJobOpts.TriggerFlags import TriggerFlags;",
   "TriggerFlags.configForStartup=\'HLToffline\';",
-  "TriggerFlags.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
   "TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
   "TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\');"
 ])
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
index 515305747f9a1be58c32abd7a549a5422c180178..ce139aea52b4be4974d4af673d57611bb824ef1d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
@@ -39,9 +39,10 @@ filter_bs.args = '-s Main ' + findFile('*_HLTMPPy_output.*.data')
 
 # Tier-0 reco step (BS->ESD->AOD)
 tzrecoPreExec = ' '.join([
+  "from AthenaConfiguration.AllConfigFlags import ConfigFlags;",
+  "ConfigFlags.Trigger.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
   "from TriggerJobOpts.TriggerFlags import TriggerFlags;",
   "TriggerFlags.configForStartup=\'HLToffline\';",
-  "TriggerFlags.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
   "TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
   "TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\');"
 ])