diff --git a/.zuul.yaml b/.zuul.yaml
index 599755e04..0570e472c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -228,7 +228,8 @@
         - packstack-integration-scenario001-tempest
         - packstack-integration-scenario002-tempest
         - packstack-integration-scenario003-tempest
-        - packstack-multinode-scenario002-tempest
+        - packstack-multinode-scenario002-tempest:
+            voting: false
         # We can't make centos8 jobs voting until we have promotion pipeline
         - packstack-centos8-integration-scenario001:
             voting: false
@@ -250,7 +251,6 @@
         - packstack-integration-scenario001-tempest
         - packstack-integration-scenario002-tempest
         - packstack-integration-scenario003-tempest
-        - packstack-multinode-scenario002-tempest
     post:
       jobs:
         - packstack-upload-git-mirror
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute.pp b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
index 0ffd42209..532e32192 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
@@ -73,6 +73,10 @@ class packstack::nova::compute ()
       $instance_usage_audit_period = 'month'
     }
 
+    class { '::nova::compute::pci':
+      passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST')
+    }
+
     class { '::nova::compute':
       enabled                       => true,
       vncproxy_host                 => hiera('CONFIG_KEYSTONE_HOST_URL'),
@@ -90,10 +94,6 @@ class packstack::nova::compute ()
       region_name => hiera('CONFIG_KEYSTONE_REGION'),
     }
 
-    class { '::nova::compute::pci':
-      passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST')
-    }
-
     include ::nova::cell_v2::discover_hosts
 
     Class['nova::compute'] ~> Class['nova::cell_v2::discover_hosts']