diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 1dd8cfdc3a3..1ee9d40d9f0 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -138,21 +138,37 @@
     reports:
       junit: results/junit.xml
 
+# ARM testing of bare-metal boards attached to an x86 gitlab-runner system
 .baremetal-test-armhf:
   extends:
     - .baremetal-test
+    - .use-debian/arm_test
   variables:
     BM_ROOTFS: /rootfs-armhf
     MINIO_ARTIFACT_NAME: mesa-armhf
+  needs:
+    - debian/arm_test
+    - job: debian-armhf
+      artifacts: false
 
+# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
 .baremetal-test-arm64:
   extends:
     - .baremetal-test
+    - .use-debian/arm_test
   variables:
     BM_ROOTFS: /rootfs-arm64
     MINIO_ARTIFACT_NAME: mesa-arm64
+  needs:
+    - debian/arm_test
+    - job: debian-arm64
+      artifacts: false
 
+# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build
 .baremetal-arm64-asan-test:
+  extends:
+    - .baremetal-test
+    - .use-debian/arm_test
   variables:
     DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6:/install/lib/libdlclose-skip.so"
     MINIO_ARTIFACT_NAME: mesa-arm64-asan
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 8a6e75e5af0..e3f73aa1fa6 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -2,7 +2,6 @@
   extends:
     - .baremetal-test-armhf
     - .vc4-rules
-    - .use-debian/arm_test
   variables:
     BM_BOOTFS: /boot/raspberrypi_armhf
     GPU_VERSION: broadcom-rpi3
@@ -10,10 +9,6 @@
     FLAKES_CHANNEL: "#videocore-ci"
   script:
     - ./install/bare-metal/poe-powered.sh
-  needs:
-    - job: debian/arm_test
-      artifacts: false
-    - debian-armhf
   tags:
     - igalia-rpi3
 
@@ -54,7 +49,6 @@ vc4-rpi3-piglit-quick_gl:armhf:
   extends:
     - .baremetal-test-armhf
     - .v3d-rules
-    - .use-debian/arm_test
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     BM_BOOTFS: /boot/raspberrypi_armhf
@@ -98,7 +92,6 @@ v3d-rpi4-piglit:armhf:
   extends:
     - .baremetal-test-armhf
     - .v3d-rules
-    - .use-debian/arm_test
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     BM_BOOTFS: /boot/raspberrypi_armhf
@@ -117,7 +110,6 @@ v3d-rpi4-traces:arm64:
   extends:
     - .piglit-traces-test
     - .baremetal-test-arm64
-    - .use-debian/arm_test
     - .v3d-rules
     - .test-manual-mr
   variables:
@@ -135,17 +127,12 @@ v3d-rpi4-traces:arm64:
       junit: results/junit.xml
   script:
     - ./install/bare-metal/poe-powered.sh
-  needs:
-    - debian/arm_test
-    - job: debian-arm64
-      artifacts: false
   tags:
     - igalia-rpi4
 
 v3dv-rpi4-vk:arm64:
   extends:
     - .baremetal-test-arm64
-    - .use-debian/arm_test
     - .v3dv-rules
   parallel: 8
   variables:
@@ -160,9 +147,5 @@ v3dv-rpi4-vk:arm64:
     VK_DRIVER: broadcom
   script:
     - ./install/bare-metal/poe-powered.sh
-  needs:
-    - debian/arm_test
-    - job: debian-arm64
-      artifacts: false
   tags:
     - igalia-rpi4
diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 777f9ffbd04..713a64e312d 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -1,7 +1,6 @@
 .etnaviv-armhf-test:
   extends:
     - .baremetal-test-armhf
-    - .use-debian/arm_test
     - .etnaviv-rules
   script:
     - ./install/bare-metal/fastboot.sh
@@ -9,10 +8,6 @@
     BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
     BM_KERNEL: /baremetal-files/zImage
     FLAKES_CHANNEL: "#etnaviv-ci"
-  needs:
-    - debian/arm_test
-    - job: debian-armhf
-      artifacts: false
 
 .etnaviv-armhf-gc2000:
   extends:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 8ff3f150cc0..adaf9667497 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -1,7 +1,6 @@
 .freedreno-test:
   extends:
     - .baremetal-test-arm64
-    - .use-debian/arm_test
     - .freedreno-rules
   variables:
     FLAKES_CHANNEL: "#freedreno-ci"
@@ -9,10 +8,6 @@
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
   script:
     - ./install/bare-metal/fastboot.sh
-  needs:
-    - debian/arm_test
-    - job: debian-arm64
-      artifacts: false
   tags:
     - google-freedreno-db410c
 
diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci.yml
index 91b0530ead9..50494c50557 100644
--- a/src/gallium/drivers/nouveau/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/nouveau/ci/gitlab-ci.yml
@@ -1,7 +1,6 @@
 .gm20b-test:
   extends:
     - .baremetal-test-arm64
-    - .use-debian/arm_test
     - .nouveau-rules
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
@@ -14,10 +13,6 @@
     HWCI_KERNEL_MODULES: tegra-drm,nouveau
   script:
     - ./install/bare-metal/poe-powered.sh
-  needs:
-    - debian/arm_test
-    - job: debian-arm64
-      artifacts: false
   tags:
     - google-nouveau-jetson-nano