diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh
index e79a7e628166184784e90e14633e4d9802a3a28d..4103305145c6a9010b680193d2c9411324cd7a2d 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh
@@ -2,15 +2,21 @@
 
 # art-description: Test of Trigger NTUP_PHYSVAL 
 # art-type: grid
-# art-include: 21.3/Athena
 # art-include: 21.0/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: *check*
+# art-output: *.txt
 # art-output: *.log
 # art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
 # art-output: *.pmon.gz
-# art-output: TotalEventsProcessed.txt
+# art-output: *perfmon*
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 # art-output: PHYSVAL_WEB
 
 export NAME="mc_ntup_physval_grid"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
index a1d746fc9c357a4287e2bb29e322bd1c3021fd83..1a7ae0a73ea0acfbfeab15265dc4bd9d9850b483 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
@@ -6,19 +6,18 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_pp_v7_trigdecisiontool_grid"
 export JOB_LOG="athena.log"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
index 18b7e54ce7f5a49826d219461ad82b4efaaf3e73..939165736d6f2a4c8519c7c558005b243097f5d8 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
@@ -6,19 +6,18 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_pp_v7_trigedm_grid"
 export JOB_LOG="athena.log"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh
index 8fb3eaf6679ea8325160ee376694639a2fc235d4..ec52f33c2c83cab201b602772c7c202e0e614ffa 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh
@@ -2,17 +2,21 @@
 
 # art-description: Test of Trigger FTK RDO->RDO_FTK 
 # art-type: grid
-# art-include: 21.3/Athena
 # art-include: 21.0/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: *check*
+# art-output: *.txt
 # art-output: *.log
-# art-output: log.RAW*
-# art-output: log.RDO*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
 # art-output: *.pmon.gz
-# art-output: TotalEventsProcessed.txt
-
+# art-output: *perfmon*
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_rdo_to_rdoftk_grid"
 export JOB_LOG="athena.log"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
index 9c7660120189e3a9ea0d9752c64d4109bcb7c7b4..4bcc091474d4593b141f378b4ee05c38083a5939 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
@@ -1,23 +1,10 @@
 #!/bin/bash
 
-# art-description: Trigger v7 primaries RDO to AOD test FTK
+# art-description: Trigger v7 primaries RDO to AOD test with FTK
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_ftk_rdotoaod_build"
 export INPUT="ftk"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
index e1d16809aad0b1137ad382bf3220db3ff60fba5c..4f927081dd266abc62e952e4f940a498307d8fdd 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
@@ -3,21 +3,18 @@
 # art-description: Trigger v7 primaries RDO to AOD test with FTK
 # art-type: grid
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_ftk_rdotoaod_grid"
 export INPUT="ftk"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
index 227d06c03ebdb403028169010339c938e6a3779b..455d02cc620d63d727525f05c05470f102701cef 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
@@ -3,19 +3,8 @@
 # art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files. With FTK
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_ftk_rdotoesdaod_build"
 export INPUT="ftk"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
index c938457e8441129e0f4013393eac788fc021bdc6..4f0b3eefe730353b2c103240152846925683f6cf 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
@@ -3,22 +3,18 @@
 # art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files. With FTK
 # art-type: grid
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
-
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_ftk_rdotoesdaod_grid"
 export INPUT="ftk"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
index ea1b9566dedde53db05507a73057acd266c424ce..c8bc217f87f52fdedae19f228b902012044e8a29 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
@@ -3,21 +3,8 @@
 # art-description: Trigger v7 primaries RDO to AOD test
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_rdotoaod_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
index b9264d1cec8ab30413d6d5cd76bc0879c5b508c5..86ac838a42767a1e056ded5d8cfe90bca316a514 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
@@ -3,21 +3,18 @@
 # art-description: Trigger v7 primaries RDO to AOD test
 # art-type: grid
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_rdotoaod_grid"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
index 8c72593f377fef182ad1c0739c44168e73acc214..0ef56c97694c1dc2484785877e2dd0b08c02fea9 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
@@ -3,19 +3,8 @@
 # art-description: Trigger v7 primaries RDO to AODSLIM
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_rdotoaodslim_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
index 01b009bf9fb7f24909339233847fb660f63af7da..4a212662ee696ab2f50be87647cb0dde1fb58022 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
@@ -3,19 +3,8 @@
 # art-description: Trigger v7 primaries RDO to BS and BS to ESD test
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_rdotobstoesd_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
index 5319932951a8f59a5f77f0c03eb14767f9ad2edc..32596756e9883daa4c81cf6c622df88e41083ed7 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
@@ -3,19 +3,8 @@
 # art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_rdotoesdaod_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
index 092df0cf3182b4f9d5fc884b077c2d01c78852fb..65f3b52d6a35377970f53544c48615d88137299b 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
@@ -3,22 +3,18 @@
 # art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files
 # art-type: grid
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
-
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_rdotoesdaod_grid"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
index b41ce19b829b9ec2d279cd035fb8e36b1c43e2ad..6ea0604578e472381f676cde8a2462f09ac30c9f 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
@@ -2,26 +2,12 @@
 
 # art-description: Trigger test on Run 1 Bytestream data
 # art-type: build
+# art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="run1_bstoesdaod_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_trigRel21_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_trigRel21_build.sh
index c83460e7d751218b1852d3f0b18efa069ed7653d..e0111850fee51ae4a557e436db45fae3fcddd492 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_trigRel21_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_trigRel21_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test running HITS->RDO in master, then RDO->RDO_TRIG in 21.0, then RDO_TRIG->AOD in master
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_HITtoAOD_trigRel21_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_build.sh
index 496e8065571d1ea7b71d67ce314166a186f95c26..51a78d9f79270b2c60ce7fa6974d90376568d46e 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform HITS->RDO->RDO_TRIG with serial athena
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_HITtoRDOTrig_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_mt1_build.sh
index 89e6708f79081ce8310968da88c7e824494d4d82..3dc102ecdb568198ccf0ea4ab20d81796126e45f 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_mt1_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_mt1_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform HITS->RDO with serial athena followed by RDO->RDO_TRIG with threads=1
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_HITtoRDOTrig_mt1_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_build.sh
index 98a02eca5056232157b7141eade1d329e6731cd7..8bd322a6b4deb79826824e253b1dfd4184ce60bb 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform RDO->RDO_TRIG->ESD->AOD with serial athena (legacy trigger)
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoAOD_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_mt1_build.sh
index 420e13b951097219fa709c1371b6d70c31bfd307..a2196baaaf78d62abe9e04a746d7e760dbd71aba 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_mt1_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_mt1_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform RDO->RDO_TRIG->ESD->AOD with threads=1
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoAOD_mt1_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_build.sh
index 3bd8f47bc8713e5db7a12d470773cb6a14d0d205..e261888d6f4fc6eea55ec87e0c571c1e0a347e55 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform RDO->RDO_TRIG->ESD->AOD->NTUP_PHYSVAL with serial athena (legacy trigger)
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoPhysval_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh
index b0c80c88776f337cc3c1f8ad2956219f76eaff6b..de67fa4c987ef6695a26fca3f701919069c6a7ad 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform RDO->RDO_TRIG->ESD->AOD with threads=1 followed by AOD->NTUP_PHYSVAL with serial athena
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoPhysval_mt1_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh
index f85929c4298077309b54a4eb301dce51e6c6764d..0fc6837c416809b388e28497bd2d4de8b150083e 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of the RDOtoRDOTrigger transform with serial athena (legacy trigger)
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoRDOTrig_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh
index 9af1931f8f790d7ba0919a9a21b77e1e5e9eb7d8..0b0991f24ca32d23acdd482c12e943455b1a6f25 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of the RDOtoRDOTrigger transform with threads=1
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoRDOTrig_mt1_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
index 424b281abe7b8674d075a81ec886d362c66a2598..9491ac338e38c0b8222b8b2ac90b507e23eae770 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
@@ -2,11 +2,6 @@
 # art-description: athenaHLT test of timeout handling
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.out
-# art-output: *.err
-# art-output: *.data
-# art-output: *.root
 
 outputBaseName="output.test_trigP1_timeout.data"
 nEvents=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_bjet_menu_ALLTE_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_bjet_menu_ALLTE_build.sh
index d3cc98b41652c22e591cde211277a4a7da8a5b2f..c13260f11eff271aa80c441817435a325d154847 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_bjet_menu_ALLTE_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_bjet_menu_ALLTE_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test with bjet ALLTE chains
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=100
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
index 4a9cba4067b6f9209c863b12c5d047e6f6576dad..fb4a353dbd6a5ab4fbd9cca402e3400dfe6a4c2a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using IDCalo job options with doID=False
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
index 82fd556c0b1ad58bc1a5e7e666826941f35312ac..cb930f12c07648473d6f929330aa576c71a0b762 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test with only calo algorithms
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
index 18bc6f649d7fd2659ceef7c733308c68e15603eb..ee603bf8b67abf141aff82c13adb7aa2136cc14a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test running only ringer
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_dataScouting_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_dataScouting_build.sh
index 92a7a1ebc9bee9bdca357272e66bcec6aea4c7e9..d84b675ded457b226d23e37014dd242db904ad02 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_dataScouting_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_dataScouting_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of the data scouting (TLA) infrastructure
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.sh
index 43f2f053a9d5e13389edbdbe8063e774446714fe..c881742f7d2abceab9b1255dc896d3316e484b61 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of BS decoding
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 # Common settings for all steps
 export EVENTS=5
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_cf_build.sh
index 4e0bce96931267a4f601c2a8cd305871d0fa471d..c3d82c83bbacd5b9e5f3c818988a0ee1dae001ea 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the egamma.withViews.py job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
index efead6c2737dbaa10198ffce4a64409230df60eb..d79ede93eebaf405e21f462a4e4e8659deae4ae8 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of egamma sequence with ringer
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
index 73fe9859e3876047c866ccc39cbc7851f540e147..cb27d3bda669b87d1efb9a4c64a7ad9c07a08690 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test on data running no HLT menu
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
index fcd8282d67fdce696070fb704629a60efac206a0..4cb77564b1447c2166bc7b2b8fdb676463acbca3 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test on MC running L1 simulation and no HLT menu
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_newjo_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_newjo_build.sh
index 0e978281322973a052fe31ba00ea24fb9539f2c3..00fa7884e5b4b060943024533dc3dae3e6e8f61d 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_newjo_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_newjo_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test running the new-style job options EmuNewJOTest.py
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export JOBOPTION="EmuNewJOTest.pkl"
 export FROMPICKLE=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
index 3807d1fbea3884feba456343463346c504da382c..d9a4904d827b396fbf5700b8653b752a339a66b7 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
index b24376d59a87e69334b79c1b8ddbe977a6f274d4..8ed9a66e057abaf61ebb60f6f1b317d896b6bc1e 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the full menu from TrigUpgradeTest job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
index 27db044be82cd5de4078ecea6ae655ea6d40ec9e..426352bbfe37648ab8979aa0e2ef67c6a714a7a7 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
@@ -2,10 +2,14 @@
 # art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
 # art-type: grid
 # art-include: master/Athena
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
 # art-output: *.new
-# art-output: *.txt
+# art-output: *.json
 # art-output: *.root
+# art-output: *.pmon.gz
+# art-output: *perfmon*
 
 export INPUT="run2dataFTK" # FTK doesn't matter here - using this dataset because of larger stats
 export EVENTS=1000
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh
index a2ff44a977b5c3549a38da6210b69068304eee8b..2e2e25c5754a092914cd632a231adce46339bdef 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=20
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_grid.sh
index 7d04e9d5276aca9fdd857aad46ad1ff5271f40cc..51d0f225de86fd4d35b2532c4b47621d2fd91ae6 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_grid.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_grid.sh
@@ -2,10 +2,14 @@
 # art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
 # art-type: grid
 # art-include: master/Athena
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
 # art-output: *.new
-# art-output: *.txt
+# art-output: *.json
 # art-output: *.root
+# art-output: *.pmon.gz
+# art-output: *perfmon*
 
 export INPUT="ttbar"
 export EVENTS=1000
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
index 037ce23424dee57face3dc1fbebde7bb4258b370..69aed3f7b608b501ea0c182d9911915351c4a17a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using IDCalo job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
index cf284274b14356a02b79eb4a6c65cc5fc01f8975..6cbd40ed4ed3fc2ba5cc21a0e741d480f4fca755 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using IDCalo job options with doCalo=False
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
index 2d5c8531e964af22e7b8cac66d775ed0aea0df77..33d5897f17bdf5b5370669b870634993dadfbe46 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test on MC using IDCalo job options with doCalo=False
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
index 75f56506ea88e8240be2580a9620cbbbef712964..32d60bbe5a432701e8eec738969ab98ff2fe5f69 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using simpleJetJob job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=5
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromCells_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromCells_build.sh
index 9dd067f5277381269841858256c609136893db13..5f4564806bf414c0450f9ff40c6009fc0d1bb7a8 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromCells_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromCells_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of MET from cells algorithm
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClustersPufit_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClustersPufit_build.sh
index a9c279c1f87f50f2f697d07592ebdef3f8ce5e90..8ec8325050abeaa5a595f02e586cf6e1da1dd936 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClustersPufit_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClustersPufit_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of MET pufit algorithm
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClusters_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClusters_build.sh
index 1e453500537c5abdc210ed62dbbc28716f5407d0..9c83c39d983fdf9691cf024e2020d81ee9d0af3d 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClusters_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClusters_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of MET from clusters algorithm
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromJets_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromJets_build.sh
index 207cc642e81661f6fc0c1da505a7fc379049c230..1ede6f0d09a96aad198cf127b6607560dfed063f 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromJets_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromJets_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of MET from jets algorithm
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
index 8ee2c47ae53330f13e515df66ea15208d332461d..40f17fa04f6318d117d063b0810c0fcaacbdebb3 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test for min bias reconstruction algorithms.
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
index 14727688f7c189f1c30a452ca5efcb48b1ed308f..9636fbfd97a7be3a7f3512cc924d45399274a18c 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using mu.withViews.py job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=50
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
index a670f1aecd0c5da6bed06c081c0da109588f391b..d66266c0a0d67ea77d8ae1fba420fb2655a1c021 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
@@ -2,9 +2,8 @@
 # art-description: athenaMT trigger test running the new-style job options from TrigUpgradeTest
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.root
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=30
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_build.sh
index 372d0f089486690f4098b94af75fde32e6c9213a..a3f89bc624ea9b40070e5b8dcfd7dff742128c42 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of the data scouting (TLA) infrastructure
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_runMenuTest_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_runMenuTest_build.sh
index c8220624794607c703c058a33303bfce6d1beb9f..96565e45ce7e020e5c38080c1d6ebda4120657c9 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_runMenuTest_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_runMenuTest_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using runMenuTest.py job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
index 78192086710dd73c18bb09e97df19ee0b500686f..349f5d6f376a1b52a7c8b6408bd8257b42ca5a35 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 bjet menu from TriggerMenuMT 
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=100
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
index 4c3405d0c8934fbb272f658da7ece4ed8a2e054f..422ebeaab19b9a4c72cef9a9c5b50133b694f337 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the muon menu from TrigUpgradeTest job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=50
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_electron_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_electron_build.sh
index 641a46a1b7feb5fe6b4fa902bcc98e2e7c34ab92..0297ba173f2916452261cf97c1dffc7abfb6f14a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_electron_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_electron_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 electron menu from TriggerMenuMT 
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
index 4edba881c82a4f142712efc832789397c95a1be8..d92f42dd00e8ee713ad175868531ce10473baf1c 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 jet menu from TriggerMenuMT 
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
index 6b98223ce9f970898c7fe4be96ce57299bb2783d..2f2630c2459ea65c76826b9e8da62829b31caec7 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 MET menu from TriggerMenuMT 
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=50
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
index 73b4099650db763accce3913c19fb561e96eb0a0..319ebf595411da95d067dd131abfaa4bab217d74 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 muon menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=50
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
index 32adfe00707b9cc818bcc7a8b45a173d64ece613..bf1e5bfd947c35dc976d059e2010aa9f725dac57 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test on MC running L1 simulation and the LS2_v1 muon menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
index 1654d6cb7d5c0a73588b076bb6a41c24239cc210..2f0d62f203c225177233d1713cdd78127df2288f 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
@@ -2,10 +2,14 @@
 # art-description: athenaMT trigger test on MC running L1 simulation and the LS2_v1 muon menu from TriggerMenuMT
 # art-type: grid
 # art-include: master/Athena
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
 # art-output: *.new
-# art-output: *.txt
+# art-output: *.json
 # art-output: *.root
+# art-output: *.pmon.gz
+# art-output: *perfmon*
 
 export EVENTS=1000
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_photon_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_photon_build.sh
index 89761cf9a63a55984587bedf9b42158d407ac12c..67d7ea008f15feaa5c4aa2879f74999e8bcc8418 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_photon_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_photon_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 photon menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
index 5b3382c01c40994e39b34396d1d73be7cf97e0c6..02f9fc85d0aedb34b4550aed78575fa3e928844d 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 tau menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh
index 43a76526a9e8735098a0e28e07f46011e1139d64..d420e10e75a0cbb4b352ab1982c0f715eccb895c 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh
@@ -5,19 +5,8 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig_*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="data_physics_pp_v7_primaries_build"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh
index feca68d429405c83fe90df50a8efe2f48f7d2cce..b78b1c4207fe7dfb1158f30d8aa333a9d7b2fe58 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh
@@ -5,19 +5,18 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig_*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="data_physics_pp_v7_primaries_grid"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
index 312302ae49032ebc9d71fc22395e275c0312c72a..7700e25e7cdbb08d72ce7bfe5689902ef60043cd 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_hi_v4_grid"
 export MENU="MC_HI_v4"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh
index c80c8a9a3e954a74c47cd7126a625385813e308a..fa208188b62fbe485bd416347583d52eae722ac4 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh
@@ -4,20 +4,19 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-include: 21.3/Athena
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_hi_v5_grid"
 export MENU="MC_HI_v5"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
index dc95c864e3aa4102a437e1abb8d3d8748e32ce65..f6fa20aeae7e79fed37ad9b8d32d2fd34dfd1754 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_hi_v4_build"
 export MENU="Physics_HI_v4"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
index ef4b3d08d59dd097f60175621b6cc7ecc4999142..ca9605ecabb9334ca3520042ccaccf566d687f12 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_hi_v4_grid"
 export MENU="Physics_HI_v4"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh
index 153c148ec501ec50bf8ae98d0b23ce74f994a179..705ea3b29bddf088ba7fc0fed55b6fc75b119955 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh
@@ -4,20 +4,9 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-include: 21.3/Athena
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_hi_v5_build"
 export MENU="Physics_HI_v5"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh
index a05c767494257686b008fbd8852ef4701688a011..6013c26db84f440b9df63b2a26bf23fd2f3962d9 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh
@@ -4,20 +4,19 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-include: 21.3/Athena
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_hi_v5_grid"
 export MENU="Physics_HI_v5"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_aod_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_aod_grid.sh
index 32edfc36bca00349d5ba16681210a3869ac76757..f9df8ae9427bd3877bd6069b2adb6dd6cdf4dced 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_aod_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_aod_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_aod_grid"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh
index e683fc63d54ccc5df571dbf5f6386e2d0ad3688d..4174b643edfa3121a8e770bf2e51128627438989 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh
@@ -6,19 +6,8 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig_*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_build"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_build.sh
index 54b02ab4a906bb02ce33f718d9b0d22bcc0eab6a..e1ec9cc5c60a1956eed60d0c83c78787551fbc34 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_build.sh
@@ -5,21 +5,9 @@
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_ftk_build"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_grid.sh
index 861f7ddad48b42e9d00c7cc2d4e71ba0d1599da7..b9905dd46a63774b97cbb0a0e5acb2f23c649548 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_grid.sh
@@ -5,21 +5,19 @@
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_ftk_grid"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_grid.sh
index c8194d0305c66918e324fefbbef5c93ec8caa3c6..21a89b17507c247e3b4d58e48fa1859a48679adc 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_grid.sh
@@ -6,19 +6,18 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_grid"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
index 604cebd95f1bfd4fbb2c8981e7fd4761f2d9874e..83441865ac127ca0fcee17e4e9c2ef0936dc1392 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_bjet_build"
 export SLICE="bjet"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
index f4d850b816194db931cd8e9b989e50ddc92232d1..cd4f1a70d615e334f716c3b626cb73bfa9806f09 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_bjet_grid"
 export SLICE="bjet"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
index dcb64a930a65751e153f5e1c695c7e7d4889c717..5069c8136c6f9486c17c2d31181e01ec9c1ad622 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_bphysics_build"
 export SLICE="bphysics"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
index f142fd56ee9ccd5e7f407c3b5807818d8db2685e..4ef1efeeb589072b7f8615687bcdbf6ec904eb11 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_bphysics_grid"
 export SLICE="bphysics"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
index 91b6df915fbc25382da28ad67a54c7d35cf26432..af7bf3812b615c2e30ae153e640b684b83872ad5 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_bphysicsexo_aod_grid"
 export SLICE="mubphysics"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
index 821e2812e97a5c61b5308545a3eb183d2d19249f..8a05540eb5de42b8ece23965c6587fd03d7075a9 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_electron_build"
 export SLICE="egamma"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
index c087f0d02c6f9729b1acb4091bb7b8ee175b8c64..c24f5e349ec0d9a5d545927ad9c0cd1f2e252a4a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_electron_grid"
 export SLICE="egamma"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
index 2c719a9a537813ac78d8305ce823a3988a5a6dd5..319463c3ded2be8532d3ef963e531ac3ae378479 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_id_build"
 export EVENTS="10"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
index d1e504164e7e6fedc67d12aa853af6391cab0c04..f102a8379b828584ebdb9bfdd51bdcd3cde6f228 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_jet_build"
 export SLICE="jet"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
index 3f9652192515a8e64fb6363d45432dbf438d3968..ef44229053187c76323831345d01b445d8270303 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_jet_grid"
 export SLICE="jet"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
index e214de732741b53fd9ccabc4526056b4c64ced8e..547a5b7046869dc0efc49ae2027173e3ee1528bf 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_l1_build"
 export EVENTS="10"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
index 1e0988945ab932adfcdf27b9c308f1ed485c9ac5..c217a006d3d2f68c9a52232a65216c2f36dc8135 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_l1_grid"
 export JOBOPTIONS="TriggerTest/testLVL1CTPAthenaTrigRDO.py"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
index 916c6b06d5fceae7c69a6ca7458a535503fcddb1..e870974e65980394667aec1745b195aa00e203d9 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_met_build"
 export SLICE="met"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
index 74d31245b2b60278cad4088ddb82f6be0f94aa2b..0bf0f94505a65603f5825f3e9f2b44ad5074e759 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_met_grid"
 export SLICE="met"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
index 20049a3882516b0f6d8767e0e8825d3475029f43..3f3eaeab902f50220a8f0cb51fac1b5c0d4a8d51 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_minbias_build"
 export SLICE="minbias"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
index 39915d32a7123a75b8e74a94a2fb6d1f6482c945..6144d572e0ced6fd2fdeb5ae77ed55301da7471a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_minbias_grid"
 export SLICE="minbias"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh
index 2c0327707e53c2e0c02bc5bcf8b2feca6ee7d5c1..691fb5a336bfe133a78f20f45ab722c54329fe9a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_minbias_hmt_build"
 export SLICE="minbiasEnhanced"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
index 4fb004319d49173772420bf61042be6638c25d1a..a011d2f1ec917ff0773277e32321d28e5e5262a2 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_minbias_hmt_grid"
 export SLICE="minbiasEnhanced"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
index c2f65a8eb2d21135ceb36281c04a30f9186a5e88..b72738366e613d54ff15b0fe90931c5da775c90e 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_muon_build"
 export SLICE="muon"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
index 90f577ed1f6e3e78fc6f76c4ad6d1079a1779b60..b82a101104feeb11adec888ad75a0058567e1086 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_muon_grid"
 export SLICE="muon"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
index a978e7abef5a3e58fcf3070c74261a3449e6ceb0..3fc39d59f9b78593e2ff83effdcba4139e984e0f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_tau_build"
 export SLICE="tau"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
index 01ae58d8ab5c6180cd5241f1e595e8af214f9937..3f02e8942d86eccb068d15b31608eac4ecb6aaaa 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_tau_grid"
 export SLICE="tau"