diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81d68fae460..9758d9afa51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -159,6 +159,7 @@ stages:
   - freedreno
   - freedreno-postmerge
   - etnaviv
+  - etnaviv-postmerge
   - software-renderer
   - software-renderer-postmerge
   - layered-backends
diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 210f0b30dd7..60c241f7996 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -21,7 +21,7 @@
       when: on_success
 
 .etnaviv-manual-rules:
-  stage: etnaviv
+  stage: etnaviv-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]