diff --git a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
index 5a2a2b76de5e05592762efb249ec63da73973294..864eeab3d4308466a6622867c465fadb0e8b9597 100755
--- a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
@@ -13,6 +13,11 @@ 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
@@ -25,23 +30,36 @@ if [ -z ${REF_FOLDER} ]; then
   export REF_FOLDER="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/${TEST}/ref/${BRANCH}/test_${NAME}"
 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"
 timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${JOB_LOG} | tee checklog.log
 
 echo "art-result: ${PIPESTATUS[0]} CheckLog"
 
-# Run perfmon
+### PERFMON
+
 timeout 1m perfmon.py -f 0.90 ntuple.pmon.gz
 timeout 1m convert -density 300 -trim ntuple.perfmon.pdf -quality 100 -resize 50% ntuple.perfmon.png
 
+### CHAINDUMP
+
 echo $(date "+%FT%H:%M %Z")"     Running chainDump"
 timeout 1m chainDump.py -S --rootFile=expert-monitoring.root
 
+### MAKE LOG TAIL FILE
+
 export JOB_LOG_TAIL=${JOB_LOG%%.*}.tail.${JOB_LOG#*.}
 tail -10000  ${JOB_LOG} > ${JOB_LOG_TAIL}
 
+### REGTEST
+
 grep REGTEST athena.log > athena.regtest
 
 if [ -f ${REF_FOLDER}/athena.regtest ]; then
@@ -68,6 +86,8 @@ else
   echo "art-result:  999 CheckCounts"
 fi
 
+### COST
+
 if [ -f trig_cost.root ]; then 
   echo $(date "+%FT%H:%M %Z")"     Running CostMon"
   timeout 2h RunTrigCostD3PD -f trig_cost.root --outputTagFromAthena --costMode > costMon.log 2>&1
@@ -75,6 +95,8 @@ else
   echo $(date "+%FT%H:%M %Z")"     file trig_cost.root does not exist thus RunTrigCostD3PD will not be run"
 fi
 
+### ZEROCOUNTS CHECK
+
 # SKIP_CHAIN_DUMP=1 skips this step
 # SKIP_CHAIN_DUMP=2 skips the L1 and HLTTE checks, but does the HLTChain check
 echo "trigedm SKIP_CHAIN_DUMP" $[SKIP_CHAIN_DUMP]
@@ -100,6 +122,8 @@ else
   echo $(date "+%FT%H:%M %Z")"    Do not run ZERO counts for this test, SKIP_CHAIN_DUMP=1"
 fi
 
+### CHECKFILE
+
 if [ -f ESD.pool.root ]; then 
   echo $(date "+%FT%H:%M %Z")"     Running CheckFile on ESD"
   timeout 10m checkFile.py ESD.pool.root | tee ESD.pool.root.checkFile
@@ -119,6 +143,8 @@ else
   echo $(date "+%FT%H:%M %Z")"     No AOD.pool.root to check"
 fi
 
+### SUMMARY
+
 echo  $(date "+%FT%H:%M %Z")"     Files in directory:"
 ls -lh
 
diff --git a/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh b/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
index c4f786b0cc23ce7121f66626d247dfc76046130f..29f2e0c326ba06c248b18a30fced244e73e06011 100755
--- a/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
@@ -57,11 +57,11 @@ else
   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"]'
 fi
 
-trap 'PREVIOUS_COMMAND=$THIS_COMMAND; THIS_COMMAND=$BASH_COMMAND' DEBUG
-
 ######################################
 
+echo "Running athena command:"
 if [[ $INPUT == 'data' ]]; then
+  (set -x
   athena.py -b -c \
   "setMenu=\"${MENU}\";\
   BSRDOInput=${DS};\
@@ -70,7 +70,9 @@ if [[ $INPUT == 'data' ]]; then
   LVL1OutputLevel=WARNING;\
   HLTOutputLevel=WARNING;" \
   ${JOBOPTION} &> ${JOB_LOG}
+  )
 else
+  (set -x
   athena.py -b -c \
   "enableCostMonitoring=${COST_MONITORING};\
   RunningRTT=True;\
@@ -83,13 +85,12 @@ else
   LVL1OutputLevel=WARNING;\
   HLTOutputLevel=WARNING;" \
   ${JOBOPTION} &> ${JOB_LOG}
+  )
 fi
 
 ######################################
 
-COMMAND=$PREVIOUS_COMMAND ATH_RETURN=$?
-echo ${COMMAND} > command.txt
-echo "Command to reproduce:"
-envsubst < command.txt
+export ATH_RETURN=$?
 echo "art-result: ${ATH_RETURN} ${JOB_LOG%%.*}"
 echo  $(date "+%FT%H:%M %Z")"     Done executing Athena test ${NAME}"
+