diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml
index 0d62852b269..1a4ae817f0e 100644
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -126,18 +126,21 @@
 
 # For piglit and skqp test jobs that run both GL and VK tests.
 .google-freedreno-turnip-rules:
+  stage: freedreno
   rules:
     - !reference [.test, rules]
     - !reference [.google-freedreno-rules, rules]
     - !reference [.google-turnip-rules, rules]
 
 .google-freedreno-turnip-manual-rules:
+  stage: freedreno
   rules:
     - !reference [.test, rules]
     - !reference [.google-freedreno-manual-rules, rules]
     - !reference [.google-turnip-manual-rules, rules]
 
 .collabora-freedreno-turnip-rules:
+  stage: freedreno
   rules:
     - !reference [.test, rules]
     - !reference [.collabora-freedreno-rules, rules]
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 1c05aa8f3a8..f9f42e9fc0d 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -134,7 +134,6 @@ a618_piglit:
   extends:
     - .lava-test-deqp:arm64
     - .lava-sc7180-trogdor-lazor-limozeen:arm64
-    - .collabora-freedreno-rules
     # Note that piglit has GL+VK integration testing.
     - .collabora-freedreno-turnip-rules
   variables: