diff --git a/src/metadata.yaml b/src/metadata.yaml
index 8d9a009..f48f279 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -16,6 +16,7 @@ tags:
   - openstack
 series:
   - xenial
+  - zesty
 subordinate: true
 provides:
   manila-plugin:
diff --git a/src/tests/gate-basic-xenial-ocata b/src/tests/gate-basic-xenial-ocata
new file mode 100755
index 0000000..59fd7c5
--- /dev/null
+++ b/src/tests/gate-basic-xenial-ocata
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deployment on xenial-ocata for keystone v2.
+"""
+
+from basic_deployment import ManilaGenericBasicDeployment
+
+if __name__ == '__main__':
+    deployment = ManilaGenericBasicDeployment(series='xenial', keystone_version='2')
+    deployment.run_tests()
diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/gate-basic-zesty-ocata
new file mode 100644
index 0000000..55420e4
--- /dev/null
+++ b/src/tests/gate-basic-zesty-ocata
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deployment on zesty-ocata for keystone v2.
+"""
+
+from basic_deployment import ManilaGenericBasicDeployment
+
+if __name__ == '__main__':
+    deployment = ManilaGenericBasicDeployment(series='zesty', keystone_version='2')
+    deployment.run_tests()