diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_CalibPeb_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_build.sh
similarity index 100%
rename from Trigger/TrigValidation/TrigP1Test/test/test_CalibPeb_build.sh
rename to Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_build.sh
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_CalibPeb_forkAndMT_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_forkAndMT_build.sh
similarity index 100%
rename from Trigger/TrigValidation/TrigP1Test/test/test_CalibPeb_forkAndMT_build.sh
rename to Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_forkAndMT_build.sh
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_CalibPeb_highForkAndMT_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_highForkAndMT_build.sh
similarity index 100%
rename from Trigger/TrigValidation/TrigP1Test/test/test_CalibPeb_highForkAndMT_build.sh
rename to Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_highForkAndMT_build.sh
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b06aaae46a500d3f35902ca7990049faca176d4a
--- /dev/null
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# art-description: Same as empty_menu test from TrigUpgradeTest, but with athenaHLT
+# art-type: build
+# art-include: master/Athena
+
+export NAME=EmptyMenu
+export ART_CMD="athenaHLT.py -n 50 -f INPUT_FILE -c 'doEmptyMenu=True;BFieldAutoConfig=False' TrigUpgradeTest/full_menu.py"
+export ART_TIMEOUT="20m"
+
+exec_art_trigp1test.sh
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_forkAndMT_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_forkAndMT_build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f3a22f25c09fef4997dc7761efe6aeafbc19ef6c
--- /dev/null
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_forkAndMT_build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# art-description: Same as empty_menu test from TrigUpgradeTest, but with athenaHLT
+# art-type: build
+# art-include: master/Athena
+
+export NAME=EmptyMenu
+export ART_CMD="athenaHLT.py --nprocs 2 --threads 2 --concurrent-events 2 -n 50 -f INPUT_FILE -c 'doEmptyMenu=True;BFieldAutoConfig=False' TrigUpgradeTest/full_menu.py"
+export ART_TIMEOUT="20m"
+
+exec_art_trigp1test.sh
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_OHMonitoring_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_OHMonitoring_build.sh
similarity index 89%
rename from Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_OHMonitoring_build.sh
rename to Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_OHMonitoring_build.sh
index f9081635a9fbdc75e056f3df8ed6d644f90f74e8..3a2a43b7d773c28b3e401ab1208c9d94c418d222 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_OHMonitoring_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_OHMonitoring_build.sh
@@ -4,7 +4,7 @@
 # art-type: build
 # art-include: master/Athena
 
-export NAME=HelloWorldHLT_OHMonitoring
+export NAME=HelloWorld_OHMonitoring
 # use export ART_FILE_NAME=... to set the INPUT_FILE value
 export ART_CMD="athenaHLT.py -M -n 10 -f INPUT_FILE AthExHelloWorld/HelloWorldOptions.py"
 export ART_TIMEOUT="20m"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_build.sh
similarity index 92%
rename from Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_build.sh
rename to Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_build.sh
index 7bda6061372006dc96c0e71efd19c154ea3ba746..aeead0be7a4a57e510edcf60a449fc0bd9e1f72e 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_build.sh
@@ -4,7 +4,7 @@
 # art-type: build
 # art-include: master/Athena
 
-export NAME=HelloWorldHLT
+export NAME=HelloWorld
 # use export ART_FILE_NAME=... to set the INPUT_FILE value 
 export ART_CMD="athenaHLT.py -n 10 -f INPUT_FILE AthExHelloWorld/HelloWorldOptions.py"
 export ART_TIMEOUT="20m"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_forkAndMT_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_forkAndMT_build.sh
similarity index 92%
rename from Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_forkAndMT_build.sh
rename to Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_forkAndMT_build.sh
index cb60f4303b3b0d3621b646008df12372a4cada49..278d9071e0f337804b2fff764882f2f27a325164 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_forkAndMT_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_forkAndMT_build.sh
@@ -4,7 +4,7 @@
 # art-type: build
 # art-include: master/Athena
 
-export NAME=HelloWorldHLT_forkAndMT
+export NAME=HelloWorld_forkAndMT
 # use export ART_FILE_NAME=... to set the INPUT_FILE value
 export ART_CMD="athenaHLT.py --nprocs 2 --threads 2 --concurrent-events 2 -n 20 -f INPUT_FILE AthExHelloWorld/HelloWorldOptions.py"
 export ART_TIMEOUT="20m"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_run_stop_run_build.sh
similarity index 92%
rename from Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh
rename to Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_run_stop_run_build.sh
index 110893da634c067dbdd921bf496af961ea142436..42787e3a7853c1328198e77c7ee0bb6d0612d59d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_run_stop_run_build.sh
@@ -4,7 +4,7 @@
 # art-type: build
 # art-include: master/Athena
 
-export NAME=HelloWorldHLT_run_stop_run
+export NAME=HelloWorld_run_stop_run
 # use export ART_FILE_NAME=... to set the INPUT_FILE value
 export TRANSITIONS="run-stop-run-saveHist.trans"
 export ART_CMD="get_files -data ${TRANSITIONS}; athenaHLT.py -i -M -f INPUT_FILE AthExHelloWorld/HelloWorldOptions.py < ${TRANSITIONS}"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_timeout.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
similarity index 77%
rename from Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_timeout.sh
rename to Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
index 10052412519fd486e99efb757518ecf7a753db90..424b281abe7b8674d075a81ec886d362c66a2598 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_timeout.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
@@ -8,10 +8,10 @@
 # art-output: *.data
 # art-output: *.root
 
-outputBaseName="output.test_athenaHLT_timeout.data"
+outputBaseName="output.test_trigP1_timeout.data"
 nEvents=20
 
-export NAME="athenaHLT_timeout"
+export NAME="timeout"
 export ART_CMD="athenaHLT -n ${nEvents} --timeout 2000 --nprocs 2 --threads 2 --concurrent-events 2 -o ${outputBaseName} -f INPUT_FILE TrigP1Test/testHLT_timeout.py"
 export ART_SKIP_CHECKLOG="true"
 export ART_NO_COUNT="true"
@@ -20,7 +20,7 @@ exec_art_trigp1test.sh
 outputFile=`ls ${outputBaseName}* | tail -n 1`
 
 # Check if there is at least one event with the debug_HltTimeout stream tag
-nDebugEvents=`trigbs_dumpHLTContentInBS.py --stag output.test_athenaHLT_timeout.data_Child-001._0001.data | grep "\[('HltTimeout', 'debug')\]" | wc -l`
+nDebugEvents=`trigbs_dumpHLTContentInBS.py --stag ${outputFile} | grep "\[('HltTimeout', 'debug')\]" | wc -l`
 if [ $nDebugEvents -gt 0 ]; then 
   echo "Found ${nDebugEvents} events with stream tag debug_HltTimeout in the output file ${outputFile}"
   echo "art-result: 0 StreamTags"
@@ -30,7 +30,7 @@ else
 fi
 
 # Check if the number of events in output is the same as number of processed events
-nOutputEvents=`trigbs_dumpHLTContentInBS.py --stats output.test_athenaHLT_timeout.data_Child-001._0001.data | grep Global_ID | wc -l`
+nOutputEvents=`trigbs_dumpHLTContentInBS.py --stats ${outputFile} | grep Global_ID | wc -l`
 if [ $nOutputEvents -eq $nEvents ]; then
   echo "All ${nEvents} processed events were found in the output file ${outputFile}"
   echo "art-result: 0 NOutputEvents"