diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 24da27827bf..94dd108d0a5 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -936,29 +936,6 @@
       - src/microsoft/vulkan/*
       when: on_success
 
-.etnaviv-rules:
-  stage: etnaviv
-  rules:
-    - !reference [.austriancoder-farm-rules, rules]
-    - !reference [.gl-rules, rules]
-    - changes: &etnaviv_file_list
-      - src/etnaviv/**/*
-      - src/gallium/drivers/etnaviv/**/*
-      - src/gallium/winsys/etnaviv/**/*
-      - src/gallium/auxiliary/renderonly/**/*
-      - src/gallium/winsys/kmsro/**/*
-      when: on_success
-
-.etnaviv-manual-rules:
-  stage: etnaviv
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.austriancoder-farm-manual-rules, rules]
-    - !reference [.gl-manual-rules, rules]
-    - changes:
-        *etnaviv_file_list
-      when: manual
-
 # Rules for unusual architectures that only build a subset of drivers
 .ppc64el-rules:
    rules:
diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index faa645c5da0..942803800a9 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -1,3 +1,27 @@
+.etnaviv-rules:
+  stage: etnaviv
+  rules:
+    - !reference [.austriancoder-farm-rules, rules]
+    - !reference [.gl-rules, rules]
+    - changes: &etnaviv_file_list
+      - src/etnaviv/**/*
+      - src/gallium/drivers/etnaviv/**/*
+      - src/gallium/winsys/etnaviv/**/*
+      - src/gallium/auxiliary/renderonly/**/*
+      - src/gallium/winsys/kmsro/**/*
+      when: on_success
+
+.etnaviv-manual-rules:
+  stage: etnaviv
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.austriancoder-farm-manual-rules, rules]
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+        *etnaviv_file_list
+      when: manual
+
+
 .etnaviv-test:arm32:
   extends:
     - .baremetal-test-arm32