diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index e5f4008bf..ca21e03cd 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -175,7 +175,8 @@
           label: gentoo-17-0-systemd
 
 - job:
-    name: zuul-jobs-test-base-roles-opensuse-15
+    name: zuul-jobs-test-base-roles-opensuse-15-nv
+    voting: false
     description: Tests roles in the 'base' job on opensuse-15
     parent: zuul-jobs-test-base-roles
     tags: auto-generated
@@ -358,7 +359,8 @@
             - secondary
 
 - job:
-    name: zuul-jobs-test-multinode-roles-opensuse-15
+    name: zuul-jobs-test-multinode-roles-opensuse-15-nv
+    voting: false
     description: Tests multinode setup roles on opensuse-15
     parent: zuul-jobs-test-multinode-roles
     tags: auto-generated
@@ -470,7 +472,7 @@
 
 - project:
     check:
-      jobs: &id001
+      jobs:
         - zuul-jobs-test-add-authorized-keys
         - zuul-jobs-test-add-gpgkey
         - zuul-jobs-test-add-sshkey
@@ -479,7 +481,7 @@
         - zuul-jobs-test-base-roles-debian-stretch
         - zuul-jobs-test-base-roles-fedora-29
         - zuul-jobs-test-base-roles-gentoo-17-0-systemd
-        - zuul-jobs-test-base-roles-opensuse-15
+        - zuul-jobs-test-base-roles-opensuse-15-nv
         - zuul-jobs-test-base-roles-opensuse-tumbleweed
         - zuul-jobs-test-base-roles-ubuntu-bionic
         - zuul-jobs-test-base-roles-ubuntu-trusty
@@ -492,7 +494,7 @@
         - zuul-jobs-test-multinode-roles-debian-stretch
         - zuul-jobs-test-multinode-roles-fedora-29
         - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
-        - zuul-jobs-test-multinode-roles-opensuse-15
+        - zuul-jobs-test-multinode-roles-opensuse-15-nv
         - zuul-jobs-test-multinode-roles-opensuse-tumbleweed
         - zuul-jobs-test-multinode-roles-ubuntu-bionic
         - zuul-jobs-test-multinode-roles-ubuntu-trusty
@@ -500,4 +502,30 @@
         - zuul-jobs-test-generate-zuul-manifest
         - zuul-jobs-test-upload-git-mirror
     gate:
-      jobs: *id001
+      jobs:
+        - zuul-jobs-test-add-authorized-keys
+        - zuul-jobs-test-add-gpgkey
+        - zuul-jobs-test-add-sshkey
+        - zuul-jobs-test-base-roles-centos-7
+        - zuul-jobs-test-base-roles-centos-8
+        - zuul-jobs-test-base-roles-debian-stretch
+        - zuul-jobs-test-base-roles-fedora-29
+        - zuul-jobs-test-base-roles-gentoo-17-0-systemd
+        - zuul-jobs-test-base-roles-opensuse-tumbleweed
+        - zuul-jobs-test-base-roles-ubuntu-bionic
+        - zuul-jobs-test-base-roles-ubuntu-trusty
+        - zuul-jobs-test-base-roles-ubuntu-xenial
+        - zuul-jobs-test-bindep
+        - zuul-jobs-test-clear-firewall
+        - zuul-jobs-test-netconsole
+        - zuul-jobs-test-dstat-graph
+        - zuul-jobs-test-multinode-roles-centos-7
+        - zuul-jobs-test-multinode-roles-debian-stretch
+        - zuul-jobs-test-multinode-roles-fedora-29
+        - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
+        - zuul-jobs-test-multinode-roles-opensuse-tumbleweed
+        - zuul-jobs-test-multinode-roles-ubuntu-bionic
+        - zuul-jobs-test-multinode-roles-ubuntu-trusty
+        - zuul-jobs-test-multinode-roles-ubuntu-xenial
+        - zuul-jobs-test-generate-zuul-manifest
+        - zuul-jobs-test-upload-git-mirror