diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
index 5e483012166..b5c965d70da 100755
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -210,10 +210,11 @@ fi
 section_end init_stage2
 
 set +e
-$HWCI_TEST_SCRIPT ${HWCI_TEST_ARGS:-}
-EXIT_CODE=$?
+$HWCI_TEST_SCRIPT ${HWCI_TEST_ARGS:-}; EXIT_CODE=$?
 set -e
 
+section_start post_test_cleanup "Cleaning up after testing, uploading results"
+
 # Make sure that capture-devcoredump is done before we start trying to tar up
 # artifacts -- if it's writing while tar is reading, tar will throw an error and
 # kill the job.
@@ -230,6 +231,7 @@ fi
 [ ${EXIT_CODE} -eq 0 ] && RESULT=pass || RESULT=fail
 
 set +x
+section_end post_test_cleanup
 
 # Print the final result; both bare-metal and LAVA look for this string to get
 # the result of our run, so try really hard to get it out rather than losing
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 8022ea34098..09f8c85a4d9 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -207,7 +207,7 @@ if [ -z "$DEQP_SUITE" ]; then
         --jobs ${FDO_CI_CONCURRENT:-4} \
         $DEQP_RUNNER_OPTIONS \
         -- \
-        $DEQP_OPTIONS
+        $DEQP_OPTIONS; DEQP_EXITCODE=$?
 else
     # If you change the format of the suite toml filenames or the
     # $GPU_VERSION-{fails,flakes,skips}.txt filenames, look through the rest
@@ -223,19 +223,18 @@ else
         --fraction-start ${CI_NODE_INDEX:-1} \
         --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
         --jobs ${FDO_CI_CONCURRENT:-4} \
-        $DEQP_RUNNER_OPTIONS
+        $DEQP_RUNNER_OPTIONS; DEQP_EXITCODE=$?
 fi
 
-DEQP_EXITCODE=$?
+{ set +x; } 2>/dev/null
+
 set -e
 
-set +x
-
-report_load
-
 section_switch test_post_process "deqp: post-processing test results"
 set -x
 
+report_load
+
 # Remove all but the first 50 individual XML files uploaded as artifacts, to
 # save fd.o space when you break everything.
 find $RESULTS_DIR -name \*.xml | \
@@ -275,6 +274,7 @@ fi
 # 0.17s on a Ryzen 5950X (16 threads, 0.95s when limited to 1 thread).
 zstd --rm -T0 -8q "$RESULTS_DIR/results.csv" -o "$RESULTS_DIR/results.csv.zst"
 
+set +x
 section_end test_post_process
 
 exit $DEQP_EXITCODE