diff --git a/defaults/main.yml b/defaults/main.yml
index 0022dc57..39b95113 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -166,6 +166,7 @@ tempest_service_available_glance: True
 tempest_service_available_heat: True
 tempest_service_available_horizon: True
 tempest_service_available_ironic: False
+tempest_service_available_manila: False
 tempest_service_available_neutron: True
 tempest_service_available_nova: True
 tempest_service_available_sahara: False
@@ -203,6 +204,7 @@ tempest_pip_packages:
   - python-glanceclient
   - python-heatclient
   - python-keystoneclient
+  - python-manilaclient
   - python-memcached
   - python-neutronclient
   - python-novaclient
diff --git a/templates/tempest.conf.j2 b/templates/tempest.conf.j2
index 5ff3eae3..05159d22 100644
--- a/templates/tempest.conf.j2
+++ b/templates/tempest.conf.j2
@@ -148,6 +148,7 @@ horizon = {{ tempest_service_available_horizon }}
 aodh = {{ tempest_service_available_aodh }}
 sahara = {{ tempest_service_available_sahara }}
 zaqar = {{ tempest_service_available_zaqar }}
+manila = {{ tempest_service_available_manila }}
 
 [telemetry]
 endpoint_type = internalURL
diff --git a/vars/main.yml b/vars/main.yml
index fe57d899..e0dc1e00 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -58,6 +58,10 @@ _tempest_plugins:
     - name: magnum-tempest-plugin
       repo: https://git.openstack.org/openstack/magnum-tempest-plugin
       branch: master
+  manila:
+    - name: manila-tempest-plugin
+      repo: https://git.openstack.org/openstack/manila-tempest-plugin
+      branch: master
   networking-bgpvpn:
     - name: networking-bgpvpn
       repo: https://git.openstack.org/openstack/networking-bgpvpn