diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 11d0247a5bd..f8766b719c8 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -303,9 +303,9 @@
 
 .b2c-test-radv-vk:
   extends:
+    - .b2c-x86_64-test-vk
     - .radv-valve-rules
     - .test-radv
-    - .b2c-x86_64-test-vk
   variables:
     B2C_KERNEL_URL: https://fs.mupuf.org/linux-6.6-b2c-radv-ci # 6.6
 
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index bcd6251c75d..a9c2d71855c 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -250,10 +250,10 @@
 .radv-zink-test-valve:
   timeout: 30m
   extends:
+    - .b2c-x86_64-test-gl
     - .zink-test
     - .test-piglit
     - .test-radv
-    - .b2c-x86_64-test-gl
   variables:
     DEQP_SUITE: zink-radv
     HWCI_TEST_SCRIPT: ./install/deqp-runner.sh