diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
index 9c207ced8c8..5b0981142b3 100755
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -208,8 +208,6 @@ set -e
 # Let's make sure the results are always stored in current working directory
 mv -f ${RESULTS_DIR} ./ 2>/dev/null || true
 
-[ ${EXIT_CODE} -ne 0 ] || rm -rf results/trace/"$PIGLIT_REPLAY_DEVICE_NAME"
-
 # 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.
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
index 6b4c5a5de52..c50a7d56641 100755
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -219,6 +219,7 @@ fi
 
 
 if [ ! -s $RESULTSFILE ]; then
+    rm -rf "${RESULTS_DIR:?}/${__PREFIX}"
     exit 0
 fi