diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index adbdb1df64c019e56c193d2f8f34851e8d4b7415..e59a9584bbdc57a4b5de4240902beda2e65a9f68 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -26,231 +26,49 @@ atlas_install_python_modules( python/*.py )
 atlas_install_scripts( test/exec*.sh test/test*.sh )
 
 # Unit tests:
-atlas_add_test( ViewSchedule1 SCRIPT test/test_view_schedule.sh
-                ENVIRONMENT THREADS=1 )
-atlas_add_test( ViewSchedule2 SCRIPT test/test_view_schedule.sh
-                ENVIRONMENT THREADS=2 )
-atlas_add_test( ViewSchedule64 SCRIPT test/test_view_schedule.sh
-                ENVIRONMENT THREADS=64 )
-
-atlas_add_test( merge
-   SCRIPT test/test_merge.sh
-   PROPERTIES TIMEOUT 1000
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_IDRunMC )
-atlas_add_test( IDRunMC
-   SCRIPT test/test_id_run_mc.sh
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_IDRunMC
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_IDRunData )
-atlas_add_test( IDRunData SCRIPT test/test_id_run_data.sh
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_IDRunData
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaRunData )
-atlas_add_test( egammaRunData
-   SCRIPT test/test_egamma_run_data.sh
-   PROPERTIES TIMEOUT 1000   
-   EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*|Fragment size"
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaRunData
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_decodeBS )
-atlas_add_test( decodeBS
-   SCRIPT test/test_decodeBS.sh
-   PROPERTIES TIMEOUT 1000
-   EXTRA_PATTERNS "-s FillMissingEDM.*(present|absent)"
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_decodeBS
-   DEPENDS egammaRunData
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_photonMenu )
-atlas_add_test( photonMenu
-   SCRIPT test/test_photon_menu.sh
-   PROPERTIES TIMEOUT 1000
-   EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_photonMenu
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_electronMenu )
-atlas_add_test( electronMenu
-   SCRIPT test/test_electron_menu.sh
-   EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_electronMenu
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_muRunData )
-atlas_add_test( muRunData
-   SCRIPT test/test_mu_run_data.sh
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_muRunData
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_muMenu )
-atlas_add_test( muMenu
-   SCRIPT test/test_mu_menu.sh
-   EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_muMenu
-   )
-
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_tauMenu )
-atlas_add_test( tauMenu
-   SCRIPT test/test_tau_menu.sh
-   EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_tauMenu
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_jet )
-atlas_add_test( jetRunData
-   SCRIPT test/test_jet.sh
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_jet
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_jetMenu )
-atlas_add_test( jetMenu
-   SCRIPT test/test_jet_menu.sh
-   EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_jetMenu
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_fullMenu )
-atlas_add_test( fullMenu
-   SCRIPT test/test_full_menu_build.sh
-   POST_EXEC_SCRIPT "trig-art-result-parser.sh fullMenu.log \"athena CheckLog RegTest\""
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_fullMenu
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_idCaloRunData )
-atlas_add_test( idCaloRunData
-   SCRIPT test/test_id_calo_run_data.sh
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_idCaloRunData
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_CaloOnlyRunData )
-atlas_add_test( CaloOnlyRunData
-   SCRIPT test/test_calo_only_data.sh
-   EXTRA_PATTERNS "-s .*ERROR.*|FastCaloL2EgammaAlg.*REGTEST*"
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_CaloOnlyRunData
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_emu_l1_decoding )
-atlas_add_test( EmuL1Decoding
-   SCRIPT test/test_emu_l1_decoding.sh
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_emu_l1_decoding
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_emu_step_processing )
-atlas_add_test( EmuStepProcessing
-   SCRIPT	test/test_emu_step_processing.sh
-   EXTRA_PATTERNS "-s TrigSignatureMoniMT.*INFO HLT_.*"
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_emu_step_processing
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_emu_newjo )
-atlas_add_test( EmuNewJO
-    SCRIPT test_emu_newjo.sh
-    EXTRA_PATTERNS "-s TrigSignatureMo.*INFO HLT_.*"
-    PROPERTIES TIMEOUT 1000
-    PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_emu_newjo
-    )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_NewJO )
-atlas_add_test( NewJO
-   SCRIPT test/test_newJO_build.sh
-   POST_EXEC_SCRIPT "trig-art-result-parser.sh NewJO.log \"Configuration athena CheckLog RegTest\""
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_NewJO
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_RunMenuTest )
-atlas_add_test( RunMenuTest
-   SCRIPT test/test_runMenuTest.sh
-   EXTRA_PATTERNS "-s .*ERROR (?\!attempt to add a duplicate).*|.*FATAL.*|TrigSignatureMoniMT .*INFO.*"
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_RunMenuTest
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_pebTest )
-atlas_add_test( pebTest
-   SCRIPT test/test_peb.sh
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_pebTest
-   EXTRA_PATTERNS "-s , robs=\[|adds PEBInfo|TriggerSummary.*HLT_"
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_dataScoutingTest )
-atlas_add_test( dataScoutingTest
-   SCRIPT test/test_dataScouting.sh
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_dataScoutingTest
-   EXTRA_PATTERNS "-s , robs=\[|adds PEBInfo|ROBFragments with IDs|{module.*words}|TriggerSummary.*HLT_"
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_l1sim )
-atlas_add_test( l1sim
-   SCRIPT test/test_l1sim.sh
-   PROPERTIES TIMEOUT 1000
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_l1sim
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_bJetMenu )
-atlas_add_test( bJetMenu
-   SCRIPT test/test_bjet_menu.sh
-   PROPERTIES TIMEOUT 1000
-   EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*"
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_bJetMenu
-   )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_bJetMenuALLTE )
-atlas_add_test( bJetMenuALLTE
-   SCRIPT test/test_bjet_menuALLTE.sh
-   PROPERTIES TIMEOUT 1000
-   EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*"
-   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_bJetMenuALLTE
-   )
-
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_fromCells )
-atlas_add_test( met_fromCells
-    SCRIPT test/test_met_fromCells.sh
-    PROPERTIES TIMEOUT 1000
-   	EXTRA_PATTERNS "-s METHypoAlg.*MET.*value" 	   
-    PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_fromCells
-    )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_fromClusters )
-atlas_add_test( met_fromClusters
-    SCRIPT test/test_met_fromClusters.sh
-    PROPERTIES TIMEOUT 1000
-   	EXTRA_PATTERNS "-s METHypoAlg.*MET.*value" 	   
-    PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_fromClusters
-    )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_fromJets )
-atlas_add_test( met_fromJets
-    SCRIPT test/test_met_fromJets.sh
-    PROPERTIES TIMEOUT 1000
-    EXTRA_PATTERNS "-s METHypoAlg.*MET.*value"     
-    PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_fromJets
-    )
-
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_menu )
-atlas_add_test( met_menu
-    SCRIPT test/test_met_menu.sh
-    PROPERTIES TIMEOUT 1000
-   	EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*" 	   
-    PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_menu 
-    )
+atlas_add_test( ViewSchedule1  SCRIPT test/test_view_schedule.sh ENVIRONMENT THREADS=1 )
+atlas_add_test( ViewSchedule2  SCRIPT test/test_view_schedule.sh ENVIRONMENT THREADS=2 )
+atlas_add_test( ViewSchedule64 SCRIPT test/test_view_schedule.sh ENVIRONMENT THREADS=64 )
+atlas_add_test( merge SCRIPT test/test_merge.sh PROPERTIES TIMEOUT 1000 )
+
+# Helper to define unit tests running in a separate directory
+# The test name is derived from the test script name: test/test_${name}.sh
+function( _add_test name )
+   file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_${name} )
+   atlas_add_test( ${name}
+      SCRIPT test/test_${name}.sh
+      PROPERTIES TIMEOUT 1000
+      PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_${name}
+      ${ARGN} )
+endfunction( _add_test )
+
+_add_test( id_run_mc )
+_add_test( id_run_data )
+_add_test( mu_run_data )
+_add_test( id_calo_run_data )
+_add_test( emu_l1_decoding )
+_add_test( jet )
+_add_test( l1sim )
+_add_test( egamma_run_data EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*|Fragment size" )
+_add_test( decodeBS EXTRA_PATTERNS "-s FillMissingEDM.*(present|absent)" PROPERTIES DEPENDS egammaRunData )
+_add_test( photon_menu EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*" )
+_add_test( electron_menu EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*" )
+_add_test( mu_menu EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*" )
+_add_test( tau_menu EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*" )
+_add_test( jet_menu EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*" )
+_add_test( calo_only_data EXTRA_PATTERNS "-s .*ERROR.*|FastCaloL2EgammaAlg.*REGTEST*" )
+_add_test( emu_step_processing EXTRA_PATTERNS "-s TrigSignatureMoniMT.*INFO HLT_.*" )
+_add_test( emu_newjo EXTRA_PATTERNS "-s TrigSignatureMo.*INFO HLT_.*" )
+_add_test( runMenuTest EXTRA_PATTERNS "-s .*ERROR (?\!attempt to add a duplicate).*|.*FATAL.*|TrigSignatureMoniMT .*INFO.*" )
+_add_test( peb EXTRA_PATTERNS "-s , robs=\[|adds PEBInfo|TriggerSummary.*HLT_" )
+_add_test( dataScouting EXTRA_PATTERNS "-s , robs=\[|adds PEBInfo|ROBFragments with IDs|{module.*words}|TriggerSummary.*HLT_" )
+_add_test( bjet_menu EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*" )
+_add_test( bjet_menuALLTE EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*" )
+_add_test( met_fromCells EXTRA_PATTERNS "-s METHypoAlg.*MET.*value" )
+_add_test( met_fromClusters EXTRA_PATTERNS "-s METHypoAlg.*MET.*value" )
+_add_test( met_fromJets EXTRA_PATTERNS "-s METHypoAlg.*MET.*value" )
+_add_test( met_menu EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*" )
+
+# ART-based tests:
+_add_test( full_menu_build POST_EXEC_SCRIPT "trig-art-result-parser.sh fullMenu.log \"athena CheckLog RegTest\"" )
+_add_test( newJO_build POST_EXEC_SCRIPT "trig-art-result-parser.sh NewJO.log \"Configuration athena CheckLog RegTest\"" )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/bjet_menu.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/bjet_menu.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenuALLTE.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/bjet_menuALLTE.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenuALLTE.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/bjet_menuALLTE.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/CaloOnlyRunData.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/calo_only_data.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/CaloOnlyRunData.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/calo_only_data.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScouting.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/dataScouting.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma_run_data.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/egamma_run_data.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/electron_menu.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/electron_menu.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJO.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_newjo.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJO.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/emu_newjo.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessing.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessing.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/jetMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/jet_menu.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/jetMenu.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/jet_menu.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/mu_menu.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/mu_menu.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/newJO_build.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/newJO_build.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/peb.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/peb.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/photon_menu.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/photon_menu.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/RunMenuTest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/RunMenuTest.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/tauMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/tau_menu.ref
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/tauMenu.ref
rename to Trigger/TrigValidation/TrigUpgradeTest/share/tau_menu.ref
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_build.sh
index 8e24ee48886e4bc5d68124add60289fdb2df1dfb..bc46b5f00e48bee1ccdf5334766c6b94e03e4b72 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_full_menu_build.sh
@@ -15,7 +15,7 @@ export JOBOPTION="TrigUpgradeTest/fullMenu.py"
 export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
 
 # Find the regtest reference installed with the release
-export REGTESTREF=`find_data.py TrigUpgradeTest/fullMenu.ref`
+export REGTESTREF=`find_data.py TrigUpgradeTest/full_menu_build.ref`
 
 source exec_TrigUpgradeTest_art_athenaMT.sh
 source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_newJO_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_newJO_build.sh
index eb228cfa982672ec83ba54f4ba57068ec7e3662a..c1700b90e7ecb679a03cfffa4c3a1a652df7055b 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_newJO_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_newJO_build.sh
@@ -16,7 +16,7 @@ export FROMPICKLE=1
 export REGTESTEXP=".*ERROR (?\!attempt to add a duplicate).*|.*FATAL.*|.*newJOtest.pkl.*|TrigSignatureMo.*INFO.*"
 
 # Find the regtest reference installed with the release
-export REGTESTREF=`find_data.py TrigUpgradeTest/NewJO.ref`
+export REGTESTREF=`find_data.py TrigUpgradeTest/newJO_build.ref`
 
 get_files -remove -jo TrigUpgradeTest/newJOtest.py