diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a55af03060..d3d14d7188 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6667,7 +6667,7 @@
             - 'ubuntu-xenial'
           pipeline: 'gate'
           branch-override: default
-          suffix: ''
+          suffix: '-nv'
       - 'gate-manila-tempest-minimal-dsvm-{driver}-{node}{suffix}':
           node:
             - 'ubuntu-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9cf44f4782..1593d774a4 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -11114,7 +11114,7 @@ projects:
       - gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial
-      - gate-grenade-dsvm-manila-ubuntu-xenial
+      - gate-grenade-dsvm-manila-ubuntu-xenial-nv
       - gate-rally-dsvm-manila-multibackend
       - gate-rally-dsvm-manila-multibackend-no-ss
       - gate-manila-ui-dsvm-nv
@@ -11125,7 +11125,6 @@ projects:
       - gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial
-      - gate-grenade-dsvm-manila-ubuntu-xenial
     post:
       - manila-coverage-db-ubuntu-trusty
       - manila-coverage-db-ubuntu-xenial