diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
index 77db9d229e7cc80f05a2e5d31c9cc77973f3a990..57d1afa11ea9e9da000b41948e2f28265533bd90 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
@@ -39,10 +39,6 @@ if TriggerFlags.doCalo:
     
     
     
-     #topSequence += algo
-     #from TrigUpgradeTest.TestUtils import L1DecoderTest
-     #l1DecoderTest=L1DecoderTest()
-     #topSequence+=l1DecoderTest
 
      from L1Decoder.L1DecoderConfig import mapThresholdToL1RoICollection 
     
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh
index 7ab73ae454100ac33f7d6ca1e861c557e74d710f..06075bbc812ed91331814585f362b9007b4a3080 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh
@@ -1,17 +1,6 @@
 #!/bin/bash
-# art-description: athenaMT trigger test with only calo algorithms
-# art-type: build
-# art-include: master/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 EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigT2CaloCommon/Calo.py"
+# athena.py --imf --evtMax 20 --threads 1 --concurrent-events 1 --filesInput /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.merge.RAW._lb0151._SFO-1._0001.1 TrigT2CaloCommon/Calo.py
 
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
+# uncomment the line above and remove this message to restore the test after the job opts are fixed
+echo "test disabled temporarily"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh
index 1de726f2d480b1e0fb965ac05fae709753098312..f67fd889774b30163f5e64c863ce351c72ed6a70 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh
@@ -1,17 +1,6 @@
 #!/bin/bash
-# art-description: athenaMT trigger test running only ringer
-# art-type: build
-# art-include: master/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 EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigT2CaloCommon/CaloRinger.py"
+# athena.py --imf --evtMax 20 --threads 1 --concurrent-events 1 --filesInput /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.merge.RAW._lb0151._SFO-1._0001.1 TrigT2CaloCommon/CaloRinger.py
 
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
+# uncomment the line above and remove this message to restore the test after the job opts are fixed
+echo "test disabled temporarily"
diff --git a/Trigger/TrigSteer/DecisionHandling/src/ITestHypoTool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ITestHypoTool.cxx
index 45961109ccef4f12d8eac26b2c4b4201ee9ee7bd..5cce8c623a225fe4c27dca365c36e6d3cd056e39 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/ITestHypoTool.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/ITestHypoTool.cxx
@@ -4,7 +4,6 @@
 // Framework includes
 
 
-// TrigUpgradeTest includes
 #include "./ITestHypoTool.h"
 
 namespace HLTTest {
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TestHypoAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TestHypoAlg.cxx
index 59728a21beeea065a9d05b4c7ab290e415f0185b..e33ed7f576c3837e2c4bfa52ccf1002cf236c298 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TestHypoAlg.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TestHypoAlg.cxx
@@ -2,7 +2,6 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// TrigUpgradeTest includes
 #include "TestHypoAlg.h"
 
 namespace HLTTest {
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TestHypoTool.cxx b/Trigger/TrigSteer/DecisionHandling/src/TestHypoTool.cxx
index 736aea835f2fb3b6659ea3106f92f07757b28007..e8306a9a7b2597f1716b8192abc4b62344b00cd2 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TestHypoTool.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TestHypoTool.cxx
@@ -1,7 +1,6 @@
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
-// TrigUpgradeTest includes
 #include "TestHypoTool.h"
 #include "TrigCompositeUtils/HLTIdentifier.h"
 
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TestInputMaker.cxx b/Trigger/TrigSteer/DecisionHandling/src/TestInputMaker.cxx
index a8725de093eea637076a94660926a6b192121361..d50e2a4ab93962f0e729e2631e2b4559de1ba651 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TestInputMaker.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TestInputMaker.cxx
@@ -2,7 +2,6 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// TrigUpgradeTest includes
 #include "TestInputMaker.h"
 #include <xAODTrigger/TrigCompositeAuxContainer.h>
 #include <TrigSteeringEvent/TrigRoiDescriptorCollection.h>
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TestRecoAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TestRecoAlg.cxx
index b9cd0a9016896a41ad2f3eb116e628eb4fb9bc2f..d29cceb2c5bb59db50631943aae7ba3e8a32d91a 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TestRecoAlg.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TestRecoAlg.cxx
@@ -2,7 +2,6 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// TrigUpgradeTest includes
 #include <iostream>
 #include <fstream>
 #include <xAODTrigger/TrigCompositeAuxContainer.h>
diff --git a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
index 2475d0234283fc6519a9db9f4ef7d08076c65b22..feeaa28058a5bc44b3d5583a3e55d93a0e98f659 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package( requests )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/TrigInDetValidation_*.py )
+atlas_install_joboptions( share/TrigInDetValidation_*.py share/Cosmic.py )
 atlas_install_runtime( test/TrigInDetValidation_TestConfiguration.xml share/TrigInDetValidation_*.py TIDAbuild )
 
 atlas_install_scripts( scripts/TIDA*.py test/test*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=ATL902 )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/Cosmic.py b/Trigger/TrigValidation/TrigInDetValidation/share/Cosmic.py
similarity index 99%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/Cosmic.py
rename to Trigger/TrigValidation/TrigInDetValidation/share/Cosmic.py
index c1a6d765a0236b9d79c32bb11f9a783be0109fa5..5e3fcb4ad2f50a22bdbdc78973072b77fbc0deee 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/Cosmic.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/Cosmic.py
@@ -3,6 +3,7 @@
 #
 doWriteRDOTrigger = False
 doWriteBS = False
+doEmptyMenu = True
 include("TriggerJobOpts/runHLT_standalone.py")
 
 from AthenaCommon.AlgSequence import AlgSequence
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmics_cf_build.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmics_cf_build.py
new file mode 100755
index 0000000000000000000000000000000000000000..e24071366a3d3e6785d2503ee1613143ef4c4563
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmics_cf_build.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# art-description: athenaMT trigger test using Cosmic.py job options
+# art-type: build
+# art-include: master/Athena
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
+
+from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+
+ex = ExecStep.ExecStep()
+ex.type = 'athena'
+ex.job_options = 'TrigInDetValidation/Cosmic.py'
+ex.input = 'data_cos'
+ex.threads = 1
+ex.max_events = 10
+
+test = Test.Test()
+test.art_type = 'build'
+test.exec_steps = [ex]
+test.check_steps = CheckSteps.default_check_steps(test)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_build.py
index 9395ca795e52da007a0b404ca4df6136a94669d7..c553234bd8d4e708caf90fb4bc3500dec4e23845 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_build.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-# art-description: Same as empty_menu test from TrigUpgradeTest, but with athenaHLT
+# art-description: Test running L1 result decoding, but no HLT chains
 # art-type: build                                                                  
 # art-include: master/Athena                                                       
 
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_forkAndMT_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_forkAndMT_build.py
index c4b661afc69c9d80d1b7cce696662c50d3647f8f..54435c88ea79b6503edeee9b4491df57765b9072 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_forkAndMT_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_EmptyMenu_forkAndMT_build.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-# art-description: EmptyMenu test with forks=2, threads=2, concurrent_events=2
+# art-description: Test running L1 result decoding, but no HLT chains, with forks=2, threads=2, concurrent_events=2
 # art-type: build                                                                  
 # art-include: master/Athena                                                       
 
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigValidation/TrigUpgradeTest/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index 3ad59ab20068ab36930920ead3202d53ceb8c383..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-Trigger/TrigValidation/TrigUpgradeTest
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
deleted file mode 100644
index e28fc2941e43de09bfbb781d08370dadb504f557..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( TrigUpgradeTest )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-atlas_install_data( share/*.ref share/*.conf )
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_scripts( test/exec*.sh test/test*.sh )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/__init__.py b/Trigger/TrigValidation/TrigUpgradeTest/python/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/disabled_test_trigUpgr_emu_newjo_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/disabled_test_trigUpgr_emu_newjo_build.sh
deleted file mode 100755
index 00fa7884e5b4b060943024533dc3dae3e6e8f61d..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/disabled_test_trigUpgr_emu_newjo_build.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test running the new-style job options EmuNewJOTest.py
-# art-type: build
-# art-include: master/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 JOBOPTION="EmuNewJOTest.pkl"
-export FROMPICKLE=1
-export REGTESTEXP="TrigSignatureMo.*INFO HLT_.*"
-
-# Find the regtest reference installed with the release
-export REGTESTREF=`find_data.py TrigUpgradeTest/emu_newjo.ref`
-
-get_files -remove -jo TrigUpgradeTest/EmuNewJOTest.py
-
-echo $(date "+%FT%H:%M %Z")"     Generate pickle file ${JOBOPTION}"
-python EmuNewJOTest.py &> athena.pickle.log # generate pickle
-status=$?
-
-if [ ${status} -ne 0 ]; then
-    echo "ERROR in configuration generation stage, stopping"
-    echo "art-result: 1 Configuration"
-    export ATH_RETURN=1
-    export JOB_LOG="athena.pickle.log"
-else
-    echo
-    echo "JOs reading stage finished, launching Athena from pickle file"
-    echo "art-result: 0 Configuration"
-    echo 
-    source exec_TrigUpgradeTest_art_athenaMT.sh
-
-    # Merge log files for post-processing
-    JOB_LOG_MERGED="athena.merged.log"
-    echo "### athena.pickle.log ###" > ${JOB_LOG_MERGED}
-    cat athena.pickle.log >> ${JOB_LOG_MERGED}
-    echo "### ${JOB_LOG} ###"
-    cat ${JOB_LOG} >> ${JOB_LOG_MERGED}
-    export JOB_LOG=${JOB_LOG_MERGED}
-fi
-
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
deleted file mode 100755
index 77ec8f579678695a26d76092ba0a24feff92fe56..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-#
-# Trigger ART test execution script based on TriggerTest/test/exec_athena_art_trigger_validation.sh
-#
-
-### DEFAULTS
-
-if [ -z "${NAME}" ]; then
-  testname=$(basename $0)
-  testname=${testname#test_}
-  testname=${testname%.sh}
-  export NAME=${testname}
-fi
-echo $(date "+%FT%H:%M %Z")"     Execute Athena test ${NAME}"
-
-if [ -z ${EVENTS} ]; then
-  export EVENTS="1000"
-fi
-
-if [ -z ${SKIPEVENTS} ]; then
-  export SKIPEVENTS="0"
-fi
-
-if [ -z ${JOBOPTION} ]; then
-  export JOBOPTION="TriggerJobOpts/runHLT_standalone.py"
-fi
-
-if [ -z ${JOB_LOG} ]; then
-  export JOB_LOG="athena.log"
-fi
-
-if [ -z ${INPUT} ]; then
-  export INPUT="run2data"
-fi
-
-if [ -z ${THREADS} ]; then
-  export THREADS="1"
-fi
-
-if [ -z ${SLOTS} ]; then
-  export SLOTS="1"
-fi
-
-# Run with PerfMon by default
-if [ -z ${DOPERFMON} ] || [ ${DOPERFMON} -ne 0 ]; then
-  export PERFMONFLAG="--perfmon"
-else
-  export PERFMONFLAG=""
-fi
-
-if [ -z ${STDCMATH} ] || [ ${STDCMATH} -eq 0 ]; then
-  if [ -f ${ATLASMKLLIBDIR_PRELOAD}/libimf.so ]; then
-    export MATHLIBOPT="--imf"
-  else
-    echo "!!! WARNING !!! Intel math library is not available, using standard cmath library instead. This may lead to differences in test results."
-    export MATHLIBOPT="--stdcmath"
-  fi
-else
-  export MATHLIBOPT="--stdcmath"
-fi
-
-###
-
-if [[ $INPUT == "run2data" ]]; then
-  export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.merge.RAW._lb0151._SFO-1._0001.1"
-elif [[ $INPUT == "run2mc_ttbar" ]]; then
-  # ttbar RDO_FTK produced in 21.3
-  export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s3214_r11234_d1505/RDO_FTK.17071950._000065.pool.root.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s3214_r11234_d1505/RDO_FTK.17071950._000235.pool.root.1"
-elif [[ $INPUT == "ttbar" ]]; then
-  # ttbar RDO produced with serial athena job in master r2019-03-20
-  export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000001.pool.root.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000002.pool.root.1"
-elif [[ $INPUT == "run2data_cosmic" ]]; then
-  export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data16_cos.00306147.physics_Main.daq.RAW._lb0494._SFO-4._0001.data"
-elif [[ $INPUT == "none" ]]; then
-  export DS=""
-elif [[ -f $INPUT ]]; then
-  export DS=${INPUT}
-else
-  echo "ERROR: input not defined, cannot run"
-  echo "art-result: 1"
-  exit 1
-fi
-
-######################################
-
-# Generate empty PoolFileCatalog.xml - this prevents incorrect handling of crashes on the grid
-ART_AVAILABLE=`which art.py >/dev/null 2>&1; echo $?`
-if [[ $ART_AVAILABLE == "0" ]]; then
-  echo "Executing art.py createpoolfile"
-  art.py createpoolfile
-fi
-
-######################################
-
-if [[ ${FROMPICKLE} == "1" ]]; then
-  echo "Running athena from pickle file ${JOBOPTION} with the command:"
-  (set -x
-  athena.py \
-  ${MATHLIBOPT} \
-  ${PERFMONFLAG} \
-  ${ATHENAOPTS} \
-  ${JOBOPTION} >${JOB_LOG} 2>&1
-  ) 2>&1
-else
-  echo "Running athena command:"
-  (set -x
-  athena.py \
-  ${MATHLIBOPT} \
-  ${PERFMONFLAG} \
-  ${ATHENAOPTS} \
-  --threads ${THREADS} \
-  --concurrent-events ${SLOTS} \
-  --filesInput "${DS}" \
-  --evtMax ${EVENTS} \
-  --skipEvents ${SKIPEVENTS} \
-  -c "${EXTRA}" \
-  ${JOBOPTION} >${JOB_LOG} 2>&1
-  ) 2>&1
-fi
-
-######################################
-
-export ATH_RETURN=$?
-echo "art-result: ${ATH_RETURN} ${JOB_LOG%.*}"
-echo  $(date "+%FT%H:%M %Z")"     Done executing Athena test ${NAME} with result ${ATH_RETURN}"
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh
deleted file mode 100755
index 0709e9ff2bd8941ff3deb0cf7d7287098de89f25..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_post.sh
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-#
-# Trigger ART test script with post-exec checks based on TriggerTest/test/exec_art_triggertest_post.sh
-#
-
-echo  $(date "+%FT%H:%M %Z")"     Execute TrigUpgradeTest post processing for test ${NAME}"
-
-### Find the branch name
-if [ -n "${AtlasBuildBranch}" ]; then
-  export BRANCH=${AtlasBuildBranch} # available after asetup
-elif [ -n "${gitlabTargetBranch}" ]; then
-  export BRANCH=${gitlabTargetBranch} # available in CI
-else
-  echo "WARNING Cannot determine the branch name, both variables AtlasBuildBranch and gitlabTargetBranch are empty"
-fi
-
-### DEFAULTS
-
-if [ -z ${ATH_RETURN} ]; then
-  echo "WARNING The env variable ATH_RETURN is not set, assuming 0"
-  export ATH_RETURN=0
-fi
-
-if [ -z ${JOB_LOG} ]; then
-  export JOB_LOG="athena.log"
-fi
-
-if [ -z ${TEST} ]; then
-  export TEST="TrigUpgradeTest"
-fi
-
-if [ -z ${ESDTOCHECK} ]; then
-  export ESDTOCHECK="ESD.pool.root"
-fi
-
-if [ -z ${AODTOCHECK} ]; then
-  export AODTOCHECK="AOD.pool.root"
-fi
-
-if [ -z ${REF_FOLDER} ]; then
-  # Try eos first
-  export REF_FOLDER="/eos/atlas/atlascerngroupdisk/data-art/grid-input/${TEST}/ref/${BRANCH}/test_${NAME}"
-  # If not available, try cvmfs
-  if [ -d ${REF_FOLDER} ]; then
-    echo "Using reference directory from eos: ${REF_FOLDER}"
-  else
-    export REF_FOLDER="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/${TEST}/ref/${BRANCH}/test_${NAME}"
-    if [ -d ${REF_FOLDER} ]; then
-      echo "Reference from eos unavailable, using one from cvmfs: ${REF_FOLDER}"
-    else
-      echo "Reference directory for test ${NAME} not available from eos or cvmfs"
-    fi
-  fi
-fi
-
-# Disable RegTest by default and enable only if regex or ref file are defined
-export DOREGTEST=0
-if [ -n "${REGTESTEXP}" ] || [ -n "${REGTESTREF}" ]; then
-  export DOREGTEST=1
-fi
-
-# Note REGTESTEXP is a GNU grep regexp, not perl regexp
-if [ -z "${REGTESTEXP}" ]; then
-  export REGTESTEXP="REGTEST"
-fi
-
-# Option to override the regtest reference location
-if [ -z "${REGTESTREF}" ]; then
-  export REGTESTREF=${REF_FOLDER}/athena.regtest
-fi
-
-### CHECKLOG
-
-# if athena failed and we are running in CI, print the full log to stdout
-if [ "${ATH_RETURN}" -ne "0" ] && [ -n "${gitlabTargetBranch}" ]; then
-  echo "Printing the full ${JOB_LOG}"
-  cat ${JOB_LOG}
-fi
-
-echo $(date "+%FT%H:%M %Z")"     Running checklog for errors"
-timeout 5m check_log.py --config checklogTriggerTest.conf --errors --showexcludestats ${JOB_LOG} 2>&1 | tee checklog.log
-echo "art-result: ${PIPESTATUS[0]} CheckLog"
-
-echo $(date "+%FT%H:%M %Z")"     Running checklog for warnings"
-timeout 5m check_log.py --config checklogTriggerTest.conf --warnings --showexcludestats ${JOB_LOG} >warnings.log 2>&1
-
-### PERFMON
-
-if [ -f ntuple.pmon.gz ]; then
-  echo $(date "+%FT%H:%M %Z")"     Running perfmon"
-  timeout 5m perfmon.py -f 0.90 ntuple.pmon.gz >perfmon.log 2>&1
-fi
-
-### HISTOGRAM COUNT
-
-if [ -f expert-monitoring.root ]; then
-  echo $(date "+%FT%H:%M %Z")"     Running histSizes"
-  timeout 5m histSizes.py -t expert-monitoring.root >histSizes.log 2>&1
-fi
-
-### MAKE LOG TAIL FILE
-
-export JOB_LOG_TAIL=${JOB_LOG%%.*}.tail.${JOB_LOG#*.}
-tail -10000  ${JOB_LOG} > ${JOB_LOG_TAIL}
-
-### REGTEST
-
-if [ ${DOREGTEST} -ne 0 ]; then
-  REGTESTREF_BASENAME=$(basename -- "${REGTESTREF}")
-  if [ -z "${REGTESTEXP_EXCLUDE}" ]; then
-    grep -E "${REGTESTEXP}" ${JOB_LOG} > "${REGTESTREF_BASENAME}"
-  else
-    grep -E "${REGTESTEXP}" ${JOB_LOG} | grep -v -E "${REGTESTEXP_EXCLUDE}" > "${REGTESTREF_BASENAME}"
-  fi
-
-  if [ -f ${REGTESTREF} ]; then
-    echo $(date "+%FT%H:%M %Z")"     Running regtest using reference file ${REGTESTREF}"
-    timeout 5m regtest.pl --inputfile ${REGTESTREF_BASENAME} --reffile ${REGTESTREF} --linematch ".*" 2>&1 | tee regtest.log
-    echo "art-result: ${PIPESTATUS[0]} RegTest"
-  else
-    echo $(date "+%FT%H:%M %Z")"     The reference file does not exist: ${REGTESTREF}"
-    echo "art-result: 999 RegTest"
-  fi
-
-  mv ${REGTESTREF_BASENAME} ${REGTESTREF_BASENAME}.new
-fi
-
-### ROOTCOMP
-
-if [ -f ${REF_FOLDER}/expert-monitoring.root ]; then
-  echo $(date "+%FT%H:%M %Z")"     Running rootcomp"
-  timeout 10m rootcomp.py --skip="TIME_" ${REF_FOLDER}/expert-monitoring.root expert-monitoring.root >rootcompout.log 2>&1
-  echo "art-result: ${PIPESTATUS[0]} RootComp"
-elif [ -f expert-monitoring.root ]; then
-  echo $(date "+%FT%H:%M %Z")"     No reference expert-monitoring.root found in ${REF_FOLDER}"
-  echo "art-result: 999 RootComp"
-else
-  echo $(date "+%FT%H:%M %Z")"     No expert-monitoring.root file and no reference are found - skipping RootComp"
-fi
-
-### CHAINDUMP
-# SKIP_CHAIN_DUMP=1 skips this step
-
-# Using temporary workaround to dump HLTChain.txt
-if [ -f expert-monitoring.root ] && [ $[SKIP_CHAIN_DUMP] != 1 ]; then
-  echo "Running chainDump"
-  timeout 5m chainDump.py -f expert-monitoring.root --json >ChainDump.log 2>&1
-fi
-
-### CHECKFILE
-
-if [ -f ${ESDTOCHECK} ]; then
-  echo $(date "+%FT%H:%M %Z")"     Running CheckFile on ESD"
-  timeout 10m checkFile.py ${ESDTOCHECK} >${ESDTOCHECK}.checkFile 2>&1
-  echo "art-result: ${PIPESTATUS[0]} CheckFileESD"
-else
-  echo $(date "+%FT%H:%M %Z")"     No ESD file to check"
-fi
-
-if [ -f ${AODTOCHECK} ]; then
-  echo $(date "+%FT%H:%M %Z")"     Running CheckFile on AOD"
-  timeout 10m checkFile.py ${AODTOCHECK} >${AODTOCHECK}.checkFile 2>&1
-  echo "art-result: ${PIPESTATUS[0]} CheckFileAOD"
-  echo $(date "+%FT%H:%M %Z")"     Running CheckxAOD AOD"
-  timeout 10m checkxAOD.py ${AODTOCHECK} >${AODTOCHECK}.checkxAOD 2>&1
-  echo "art-result: ${PIPESTATUS[0]} CheckXAOD"
-  echo $(date "+%FT%H:%M %Z")"     Running checkFileTrigSize_RTT.py AOD"
-  export TRIGSIZE_LOG=${JOB_LOG%%.*}.TrigEDMSize.${JOB_LOG#*.}
-  timeout 10m checkFileTrigSize_RTT.py ${AODTOCHECK} > ${TRIGSIZE_LOG} 2>&1
-  echo "art-result: ${PIPESTATUS[0]} checkFileTrigSize_RTT.py"
-else
-  echo $(date "+%FT%H:%M %Z")"     No AOD file to check"
-fi
-
-### GENERATE JSON WITH POST-PROCESSING INFORMATION
-
-echo $(date "+%FT%H:%M %Z")"     Running trig-test-json.py"
-timeout 5m trig-test-json.py
-cat extra-results.json && echo
-
-### SUMMARY
-
-echo  $(date "+%FT%H:%M %Z")"     Files in directory:"
-ls -lh
-
-echo  $(date "+%FT%H:%M %Z")"     Finished TrigUpgradeTest post processing for test ${NAME}"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_cosmics_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_cosmics_cf_build.sh
deleted file mode 100755
index 6d7798da97546ce702400d8c8cae863a45645206..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_cosmics_cf_build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using IDCalo job options
-# art-type: build
-# art-include: master/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 EVENTS=10
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/Cosmic.py"
-
-#export EXTRA="isOnline=True;doEmptyMenu=True;doWriteBS=False;doWriteRDOTrigger=True;forceEnableAllChains=True"
-#export EXTRA="isOnline=True;doEmptyMenu=True;doWriteBS=False"
-export EXTRA="doEmptyMenu=True;doWriteBS=False;doWriteRDOTrigger=True;"
-export INPUT="run2data_cosmic"
-#export ATHENAOPTS=" -l DEBUG "
-
-
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
deleted file mode 100755
index d94e28694b3897ed9875f18d52ed3d33af17a4f0..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using mu.withViews.py job options
-# art-type: build
-# art-include: master/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 EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/full_menu_cf.py"
-export EXTRA="doEmptyMenu=True;doMuonSlice=True"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py b/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
index 8a9359dcd4691821688451f5a607f4fc0f645a15..69b6d38dfc0ddacc169cb07ce6924a675eef4cad 100755
--- a/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
+++ b/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
@@ -17,8 +17,7 @@ from TrigValTools.TrigARTUtils import package_prefix, find_scripts, remember_cwd
 def minimal_pattern(package):
     dict = {'TriggerTest':      '(test_trig_data_v1Dev_build|test_trig_data_newJO_build)',
             'TrigP1Test':       'test_trigP1_v1Dev_build',
-            'TrigAnalysisTest': 'test_trigAna_RDOtoRDOTrig_mt1_build',
-            'TrigUpgradeTest':  None}
+            'TrigAnalysisTest': 'test_trigAna_RDOtoRDOTrig_mt1_build'}
     if package == 'ALL':
         return '({})'.format('|'.join([v for v in dict.values() if v]))
     elif package in dict and dict[package] is not None:
@@ -29,7 +28,7 @@ def minimal_pattern(package):
 
 
 def get_parser():
-    packages = ['TriggerTest', 'TrigAnalysisTest', 'TrigP1Test', 'TrigUpgradeTest', 'ALL']
+    packages = ['TriggerTest', 'TrigAnalysisTest', 'TrigP1Test', 'ALL']
     parser = argparse.ArgumentParser(usage='%(prog)s [options] [PackageName]')
     parser.add_argument('package',
                         metavar='PackageName',
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Common.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Common.py
index 22d0a003f8254318108fb44e64b20cbd853e3aae..7eb89084f28f8930a684e7e4fe55fe600559cb78 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Common.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Common.py
@@ -20,7 +20,6 @@ trigvalsteering_logging_level = logging.INFO
 package_prefix_dict = {'TriggerTest':         'trig_',
                        'TrigP1Test':          'trigP1_',
                        'TrigAnalysisTest':    'trigAna_',
-                       'TrigUpgradeTest':     'trigUpgr_',
                        'TrigInDetValidation': 'trigID_'}
 
 # Log file with all art-result statements
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/ExecStep.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/ExecStep.py
index b0edece9041c32f4a4dd4e7c322b9070f1bb5e73..1ef912ba5aa0934776350419a40af6576201221f 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/ExecStep.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/ExecStep.py
@@ -161,10 +161,7 @@ class ExecStep(Step):
                 athenaopts += ' --perfmon'
 
         # Default threads/concurrent_events/forks
-        if test.package_name == 'TrigUpgradeTest':
-            if self.threads is None:
-                self.threads = 1
-        elif test.package_name == 'TrigP1Test' and self.type == 'athenaHLT':
+        if test.package_name == 'TrigP1Test' and self.type == 'athenaHLT':
             if self.threads is None:
                 self.threads = 1
             if self.concurrent_events is None:
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
index 2a84539455c6a0a93f605d9da65f190d131783a8..4610b7726757ee33114a52e7f01402d434f05f80 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
@@ -14,7 +14,7 @@ copy_jo = ExecStep.ExecStep('CopyJO')
 copy_jo.type = 'other'
 copy_jo.input = ''
 copy_jo.executable = 'get_files'
-copy_jo.args = '-remove -jo TrigUpgradeTest/newJOtest.py'
+copy_jo.args = '-remove -jo TriggerJobOpts/runHLT_standalone_newJO.py'
 copy_jo.prmon = False
 copy_jo.auto_report_result = False  # Do not set art-result for this step
 copy_jo.output_stream = Step.Step.OutputStream.STDOUT_ONLY  # Do not create a log file for this step
@@ -24,14 +24,14 @@ pickle = ExecStep.ExecStep('GeneratePickle')
 pickle.type = 'other'
 pickle.input = ''
 pickle.executable = 'python'
-pickle.args = 'newJOtest.py'
+pickle.args = 'runHLT_standalone_newJO.py'
 pickle.prmon = False
 
 # The main job running athena from pickle
 run_athena = ExecStep.ExecStep('newJO')
 run_athena.type = 'athena'
 run_athena.use_pickle = True
-run_athena.job_options = 'newJOtest.pkl'
+run_athena.job_options = 'runHLT_standalone_newJO.py'
 run_athena.input = ''
 
 # The full test configuration
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/TriggerHistSvcConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py
similarity index 91%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/TriggerHistSvcConfig.py
rename to Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py
index aa0acf5095b7c141f8d7ed4ed805a1015a964772..9cd5673247172a797d16e9e729fdfc0d355fc4a3 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/TriggerHistSvcConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
 def TriggerHistSvcConfig(flags):
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
similarity index 84%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
rename to Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
index dfaba5c82cb7eaf4ada409655befa753e26c2c81..64883d9abd46e74b9f61807d2543e4dd94776d8c 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
@@ -1,14 +1,10 @@
 #
-#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentAccumulator import CompFactory
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
-from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq, findAlgorithm, findOwningSequence
-from AthenaCommon.AlgSequence import dumpMasterSequence
-from AthenaCommon.AppMgr import theApp
 
 from AthenaCommon.Configurable import Configurable
 Configurable.configurableRun3Behavior=1
@@ -35,8 +31,8 @@ flags.Trigger.CostMonitoring.doCostMonitoring = True
 import importlib
 setupMenuPath = "TriggerMenuMT.HLTMenuConfig.Menu."+flags.Trigger.triggerMenuSetup+"_newJO"
 setupMenuModule = importlib.import_module( setupMenuPath )
-assert setupMenuModule != None, "Could not import module {}".format(setupMenuPath)
-assert setupMenuModule.setupMenu != None, "Could not import setupMenu from {}".format(setupMenuPath)
+assert setupMenuModule is not None, "Could not import module {}".format(setupMenuPath)
+assert setupMenuModule.setupMenu is not None, "Could not import setupMenu from {}".format(setupMenuPath)
 flags.needFlagsCategory('Trigger')
 setupMenuModule.setupMenu(flags)
 flags.Exec.MaxEvents=50
@@ -52,7 +48,7 @@ flags.InDet.usePixelDCS=False
 
 flags.lock()
 
-from AthenaCommon.Constants import INFO,DEBUG,WARNING
+from AthenaCommon.Constants import DEBUG,WARNING
 acc = MainServicesCfg( flags )
 acc.getService('AvalancheSchedulerSvc').VerboseSubSlots = True
 
@@ -65,7 +61,7 @@ from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
 acc.merge(ByteStreamReadCfg( flags ))
 
 
-from TrigUpgradeTest.TriggerHistSvcConfig import TriggerHistSvcConfig
+from TriggerJobOpts.TriggerHistSvcConfig import TriggerHistSvcConfig
 acc.merge(TriggerHistSvcConfig( flags ))
 
 from TriggerMenuMT.HLTMenuConfig.Menu.GenerateMenuMT_newJO import generateMenu as generateHLTMenu
@@ -97,7 +93,7 @@ acc.foreach_component("*/L1Decoder").OutputLevel = DEBUG
 acc.foreach_component("*FastEMCaloAlgo*").OutputLevel = DEBUG
 acc.foreach_component("VDVFastEgammaCalo").OutputLevel =DEBUG
 
-fname = "newJOtest.pkl"
+fname = "runHLT_standalone_newJO.pkl"
 print( "Storing config in the file {}".format( fname ) )
 with open(fname, "wb") as p:
     acc.store( p )