diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 97eba5abcd8..fbe2dbb6bdb 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -581,6 +581,12 @@
     - !reference [.turnip-rules, rules]
     - !reference [.zink-common-rules, rules]
 
+.zink-radv-rules:
+  stage: layered-backends
+  rules:
+    - !reference [.radv-rules, rules]
+    - !reference [.zink-common-rules, rules]
+
 # Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
 # rules duplication manually
 .windows-build-rules:
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 2b7fe60910b..f2ab2a159e2 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -158,8 +158,6 @@ radeonsi-raven-va:amd64:
 
 ############### Valve Infra
 .test-radv:
-  extends:
-    - .radv-valve-rules
   variables:
     VK_DRIVER: radeon
     DRIVER_NAME: radv
@@ -177,16 +175,10 @@ radeonsi-raven-va:amd64:
 
 .b2c-test-radv-vk:
   extends:
+    - .radv-valve-rules
     - .test-radv
     - .b2c-test-vk
 
-.b2c-test-radv-gl:
-  extends:
-    - .test-radv
-    - .b2c-test-gl
-  variables:
-    MESA_LOADER_DRIVER_OVERRIDE: zink
-
 .deqp-test-valve:
   variables:
     B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
@@ -363,37 +355,10 @@ vkcts-vangogh-valve:
   variables:
     GPU_VERSION: radv-vangogh-aco
 
-############### Combined Zink testing (GL, GLES, Piglit)
-.radv-zink-test-valve:
-  extends:
-    - .b2c-test-radv-gl
-    - .test-manual-mr
-  variables:
-    PIGLIT_PROFILES: all
-    PIGLIT_PLATFORM: gbm
-    B2C_TEST_SCRIPT: ./install/valve/gl_combined_testing.sh
-    B2C_JOB_SUCCESS_REGEX: 'Execution is over, pipeline status: 0'
-
-radv-zink-navi10-valve:
-  extends:
-    - .radv-zink-test-valve
-    - .navi10-test-valve
-    - .test-manual-mr
-  variables:
-    GPU_VERSION: zink-radv-navi10
-
-radv-zink-vangogh-valve:
-  parallel: 2
-  extends:
-    - .radv-zink-test-valve
-    - .vangogh-test-valve
-    - .test-manual-mr
-  variables:
-    GPU_VERSION: zink-radv-vangogh
-
 ############### Fossilize
 radv-fossils:
   extends:
+    - .radv-valve-rules
     - .test-vk
     - .test-radv
     - .fossilize-test
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index abc8812ae5b..e6e4469f38b 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -115,3 +115,36 @@ zink-freedreno-a630-traces:
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "zink-a630"
     ZINK_DEBUG: rp
+
+############### Combined testing (GL, GLES, Piglit) on RADV
+.radv-zink-test-valve:
+  extends:
+    - .zink-radv-rules
+    - .zink-test
+    - .test-radv
+    - .b2c-test-gl
+  variables:
+    PIGLIT_PROFILES: all
+    PIGLIT_PLATFORM: gbm
+    B2C_TEST_SCRIPT: ./install/valve/gl_combined_testing.sh
+    B2C_JOB_SUCCESS_REGEX: 'Execution is over, pipeline status: 0'
+
+    # Disable reporting, since DUTs don't have internet access
+    FLAKES_CHANNEL: ""
+
+zink-radv-navi10-valve:
+  extends:
+    - .radv-zink-test-valve
+    - .navi10-test-valve
+    - .test-manual-mr
+  variables:
+    GPU_VERSION: zink-radv-navi10
+
+zink-radv-vangogh-valve:
+  parallel: 2
+  extends:
+    - .radv-zink-test-valve
+    - .vangogh-test-valve
+    - .test-manual-mr
+  variables:
+    GPU_VERSION: zink-radv-vangogh