diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 496706a5d72..00f82c53f88 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -64,6 +64,7 @@ VARS=(
     HWCI_KVM
     HWCI_START_WESTON
     HWCI_START_XORG
+    HWCI_TEST_ARGS
     HWCI_TEST_SCRIPT
     IR3_SHADER_DEBUG
     JOB_ARTIFACTS_BASE
diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
index 1c280a13fc0..3d7465c51d0 100755
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -201,7 +201,7 @@ if [ -n "$HWCI_START_WESTON" ]; then
 fi
 
 set +e
-bash -c ". $SCRIPTS_DIR/setup-test-env.sh && $HWCI_TEST_SCRIPT"
+$HWCI_TEST_SCRIPT ${HWCI_TEST_ARGS:-}
 EXIT_CODE=$?
 set -e
 
diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh
index 38e8cd16480..d64940fc768 100755
--- a/.gitlab-ci/crosvm-runner.sh
+++ b/.gitlab-ci/crosvm-runner.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
+
 set -e
 
 # Instead of starting one dEQP instance per available CPU core, pour our
diff --git a/.gitlab-ci/run-shellcheck.sh b/.gitlab-ci/run-shellcheck.sh
index 9691ccd38f1..2b1d0852b80 100755
--- a/.gitlab-ci/run-shellcheck.sh
+++ b/.gitlab-ci/run-shellcheck.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 CHECKPATH=".gitlab-ci"
+export SCRIPTS_DIR="${CHECKPATH}"
 
 is_bash() {
     [[ $1 == *.sh ]] && return 0
diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
index f6e8acec012..a3447912acf 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
@@ -71,7 +71,8 @@
   variables:
     HWCI_KERNEL_MODULES: vhost_vsock
     HWCI_KVM: "true"
-    HWCI_TEST_SCRIPT: "/install/crosvm-runner.sh /install/piglit/piglit-traces.sh"
+    HWCI_TEST_SCRIPT: "/install/crosvm-runner.sh"
+    HWCI_TEST_ARGS: "/install/piglit/piglit-traces.sh"
     PARALLELISE_VIA_LP_THREADS: 1
     GPU_VERSION: virgl
     DRIVER_NAME: virgl