diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 4d03dfa4..b5881e6a 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -18,4 +18,11 @@
 # whether the host is in the host group and the service is
 # enabled.
 #
-tempest_package_list: "{{ tempest_distro_packages + tempest_service_distro_packages }}"
+# Note (odyssey4me):
+# The yum module does not accept an empty item
+# in the list, so we need to ensure that empty
+# items are not included in the list.
+tempest_package_list: >-
+  {{ tempest_distro_packages
+     + tempest_service_distro_packages
+     + (tempest_plugin_distro_packages | reject('equalto', '')) | list }}
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index b2851952..77085882 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -18,6 +18,17 @@ tempest_distro_packages:
   - git
 
 tempest_service_distro_packages:
-  - openstack-tempest-all
+  - openstack-tempest
   - python-subunit
   - subunit-filters
+
+tempest_plugin_distro_packages:
+  - "{{ (tempest_service_available_cinder | bool) | ternary('python-cinder-tests-tempest', '') }}"
+  - "{{ (tempest_service_available_heat | bool) | ternary('python-heat-tests-tempest', '') }}"
+  - "{{ tempest_service_available_horizon | bool | ternary('python-horizon-tests-tempest', '') }}"
+  - "{{ (tempest_service_available_ironic | bool) | ternary('python-ironic-tests-tempest', '') }}"
+  - python-keystone-tests-tempest
+  - "{{ (tempest_service_available_neutron | bool) | ternary('python-neutron-tests-tempest', '') }}"
+  - "{{ (tempest_service_available_sahara | bool) | ternary('python-sahara-tests-tempest', '') }}"
+  - "{{ (tempest_service_available_zaqar | bool) | ternary('python-zaqar-tests-tempest', '') }}"
+
diff --git a/vars/suse.yml b/vars/suse.yml
index 189eaa18..30e27aea 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -22,3 +22,10 @@ tempest_service_distro_packages:
   - "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('python-python-subunit', 'python2-python-subunit') }}"
   - "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('python-os-testr', 'python2-os-testr') }}"
   - python-junitxml
+
+tempest_plugin_distro_packages:
+  - "{{ (tempest_service_available_cinder | bool) | ternary('python-cinder-tempest-plugin', '') }}"
+  - "{{ (tempest_service_available_heat | bool) | ternary('python-heat-tempest-plugin', '') }}"
+  - "{{ (tempest_service_available_ironic | bool) | ternary('python-ironic-tempest-plugin', '') }}"
+  - python-keystone-tempest-plugin
+  - "{{ (tempest_service_available_neutron | bool) | ternary('python-neutron-tempest-plugin', '') }}"
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index a2ff744e..2821babe 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -24,3 +24,9 @@ tempest_distro_packages:
 tempest_service_distro_packages:
   - tempest
   - python-subunit
+
+# Note(odyssey4me):
+# Ubuntu does not publish tempest plugin packages. They do
+# all their testing using the source-based installation of
+# tempest.
+tempest_plugin_distro_packages: []