diff --git a/.gitlab-ci/test/gitlab-ci-inc.yml b/.gitlab-ci/test/gitlab-ci-inc.yml
index 38fd295ddcd..703eacfe0df 100644
--- a/.gitlab-ci/test/gitlab-ci-inc.yml
+++ b/.gitlab-ci/test/gitlab-ci-inc.yml
@@ -143,12 +143,7 @@
     PIGLIT_REPLAY_DEVICE_NAME: $GPU_VERSION
     PIGLIT_RESULTS: "${GPU_VERSION}-replay"
     PIGLIT_NO_WINDOW: 1
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
-  script:
-    - section_start variables "Variables passed through:"
-    - filter_env_vars
-    - section_end variables
-    - install/piglit/piglit-traces.sh
+    HWCI_TEST_SCRIPT: "install/piglit/piglit-traces.sh"
 
 .deqp-test:
   script:
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 0181e3d6acc..72588802262 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -23,6 +23,11 @@ llvmpipe-traces:
     EGL_PLATFORM: "surfaceless"
     PIGLIT_TRACES_FILE: traces-llvmpipe.yml
     PIGLIT_REPLAY_DEVICE_NAME: "gl-vmware-llvmpipe"
+  script:
+    - section_start variables "Variables passed through:"
+    - filter_env_vars
+    - section_end variables
+    - $HWCI_TEST_SCRIPT
 
 llvmpipe:
   variables: