diff --git a/tests/test-install-neutron.yml b/tests/test-install-neutron.yml
index 231c3515..0d588ec7 100644
--- a/tests/test-install-neutron.yml
+++ b/tests/test-install-neutron.yml
@@ -18,6 +18,14 @@
   user: root
   gather_facts: true
   pre_tasks:
+    # NOTE: These are typically installed in the repo server where we build the
+    #       neutron wheel
+    - name: Install packages required to build neutron python package
+      apt:
+        name: "{{ item }}"
+      with_items:
+        - libffi-dev
+      when: inventory_hostname in groups['neutron_all']
     - name: Ensure rabbitmq vhost
       rabbitmq_vhost:
         name: "{{ neutron_rabbitmq_vhost }}"
diff --git a/tests/test-install-nova.yml b/tests/test-install-nova.yml
index 4f3ceff2..5e47ee14 100644
--- a/tests/test-install-nova.yml
+++ b/tests/test-install-nova.yml
@@ -29,7 +29,7 @@
         - libffi-dev
         - pkg-config
         - libvirt-dev
-      when: inventory_hostname in groups['nova_compute']
+      when: inventory_hostname in groups['nova_all']
     - name: Ensure rabbitmq vhost
       rabbitmq_vhost:
         name: "{{ nova_rabbitmq_vhost }}"