diff --git a/.pick_status.json b/.pick_status.json
index c5fd8536e10..a1baff842fc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -864,7 +864,7 @@
         "description": "ci/intel: decompose anv-tgl-test so we can specify custom devices for TGL",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index c54a6bc7dee..5d1ccccef33 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -121,7 +121,8 @@
 
 .zink-anv-test:
   extends:
-    - .anv-tgl-test
+    - .lava-asus-cx9400-volteer:x86_64
+    - .anv-test
     - .zink-anv-rules
     - .zink-test
   variables:
diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml
index 16a9e19408a..99e37fa0fe3 100644
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -278,11 +278,6 @@
     - .intel-rules
 
 ## ANV only
-.anv-tgl-test:
-  extends:
-    - .anv-test
-    - .lava-asus-cx9400-volteer:x86_64
-
 .anv-angle-test:
   extends:
     - .anv-test
@@ -387,7 +382,8 @@
 ## Intel (anv + iris)
 .intel-tgl-test:
   extends:
-    - .anv-tgl-test
+    - .lava-asus-cx9400-volteer:x86_64
+    - .anv-test
     - .intel-test
   variables:
     GPU_VERSION: intel-tgl
diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml
index 57e40992ff6..a3b16221db7 100644
--- a/src/intel/ci/gitlab-ci.yml
+++ b/src/intel/ci/gitlab-ci.yml
@@ -24,7 +24,8 @@ anv-jsl:
 
 anv-tgl:
   extends:
-    - .anv-tgl-test
+    - .lava-asus-cx9400-volteer:x86_64
+    - .anv-test
   variables:
     DEQP_SUITE: anv-tgl
     DEQP_FRACTION: 5 # temporarily drop network load
@@ -80,7 +81,8 @@ anv-jsl-angle-full:
 
 anv-tgl-angle:
   extends:
-    - .anv-tgl-test
+    - .lava-asus-cx9400-volteer:x86_64
+    - .anv-test
     - .anv-angle-test
   variables:
     DEQP_SUITE: anv-tgl-angle