diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3c170e93bd..d55feabeb25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ variables:
   LIMA_FARM: "online"
   IGALIA_FARM: "online"
   ANHOLT_FARM: "online"
+  VALVE_FARM: "online"
 
 default:
   before_script:
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 0e5177058fd..b9119b1c6f9 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -160,6 +160,11 @@
     - if: '$ANHOLT_FARM == "offline"'
       when: never
 
+.valve-farm-rules:
+  rules:
+    - if: '$VALVE_FARM == "offline"'
+      when: never
+
 # Skips freedreno jobs if either of the farms we use are offline.
 .freedreno-farm-rules:
   rules:
@@ -347,13 +352,24 @@
 .radv-rules:
   stage: amd
   rules:
-    - !reference [.collabora-farm-rules, rules]
     - !reference [.vulkan-rules, rules]
     - changes: &radv_file_list
       - src/amd/**/*
       - src/vulkan/**/*
       when: on_success
 
+.radv-collabora-rules:
+  stage: amd
+  rules:
+    - !reference [.collabora-farm-rules, rules]
+    - !reference [.radv-rules, rules]
+
+.radv-valve-rules:
+  stage: amd
+  rules:
+    - !reference [.valve-farm-rules, rules]
+    - !reference [.radv-rules, rules]
+
 .virgl-rules:
   stage: layered-backends
   rules:
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 772e9c88b40..abb6ff14cbe 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -24,7 +24,7 @@
 .radv-stoney-test:amd64:
   extends:
     - .stoney-test:amd64
-    - .radv-rules
+    - .radv-collabora-rules
   variables:
     DEQP_VER: vk
     DRIVER_NAME: radv
@@ -83,7 +83,7 @@ radeonsi-stoney-traces:amd64:
 .radv-raven-test:amd64:
   extends:
     - .raven-test:amd64
-    - .radv-rules
+    - .radv-collabora-rules
   variables:
     GPU_VERSION: radv-raven
     VK_DRIVER: radeon
@@ -160,7 +160,7 @@ radeonsi-raven-va:amd64:
 ############### Valve Infra
 .test-radv:
   extends:
-    - .radv-rules
+    - .radv-valve-rules
   variables:
     VK_DRIVER: radeon
     DRIVER_NAME: radv