diff --git a/src/gallium/drivers/svga/ci/gitlab-ci-inc.yml b/src/gallium/drivers/svga/ci/gitlab-ci-inc.yml
index ccc1a90c099..7e09841a475 100644
--- a/src/gallium/drivers/svga/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/svga/ci/gitlab-ci-inc.yml
@@ -1,4 +1,5 @@
 .vmware-rules:
+  stage: layered-backends
   rules:
     - !reference [.test, rules]
     - !reference [.vmware-farm-rules, rules]
@@ -13,6 +14,7 @@
       when: on_success
 
 .vmware-manual-rules:
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
diff --git a/src/gallium/drivers/svga/ci/gitlab-ci.yml b/src/gallium/drivers/svga/ci/gitlab-ci.yml
index b96af56ea36..98e4e4e597a 100644
--- a/src/gallium/drivers/svga/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/svga/ci/gitlab-ci.yml
@@ -2,7 +2,7 @@ include:
   - local: 'src/gallium/drivers/svga/ci/gitlab-ci-inc.yml'
 
 .vmware-qemu-traces:x86_64:
-  stage: software-renderer
+  stage: software-renderer-nightly
   extends:
     - .lava-x86_64-piglit-traces
     - .vmware-manual-rules
@@ -21,7 +21,6 @@ include:
     FDO_HTTP_CACHE_URI: ""
 
 vmware-vmx-piglit:x86_64:
-  stage: layered-backends
   extends:
     - .lava-x86_64-test-gl
     - .test-piglit