diff --git a/packstack/puppet/modules/packstack/manifests/nova/api.pp b/packstack/puppet/modules/packstack/manifests/nova/api.pp
index f09c40979..e935c5333 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/api.pp
@@ -23,6 +23,10 @@ class packstack::nova::api ()
       $pci_alias = hiera('CONFIG_NOVA_PCI_ALIAS')
     }
 
+    class { '::nova::pci':
+      aliases                              => $pci_alias,
+    }
+
     class { '::nova::api':
       api_bind_address           => $bind_host,
       enabled                    => true,
@@ -58,10 +62,6 @@ class packstack::nova::api ()
       db_sync_timeout => 600,
     }
 
-    class { '::nova::pci':
-      aliases                              => $pci_alias,
-    }
-
     class { '::nova::placement':
       auth_url    => $www_authenticate_uri,
       password    => $admin_password,
diff --git a/run_tests.sh b/run_tests.sh
index 81ff8f6e4..015846926 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -179,6 +179,7 @@ OS_VERSION=$(facter operatingsystemmajrelease)
 if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 7 ]; then
     $SUDO $PKG_MGR -y install python3-setuptools \
                               python3-devel \
+                              python3-wheel \
                               python3-pyyaml
 else
     $SUDO $PKG_MGR -y install python-setuptools \
@@ -190,7 +191,7 @@ fi
 which pip3 && PIP=pip3
 if [ -z $PIP ]; then
     if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 7 ]; then
-        $SUDO $PKG_MGR -y install python3-pip
+        $SUDO $PKG_MGR -y install python3-pip python3-wheel
         PIP=pip3
     else
         which pip || $SUDO easy_install pip