diff --git a/src/tests/gate-basic-xenial-ocata b/src/tests/gate-basic-xenial-ocata
new file mode 100644
index 0000000..41dbd67
--- /dev/null
+++ b/src/tests/gate-basic-xenial-ocata
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on xenial-ocata for keystone v3.
+"""
+
+from basic_deployment import BarbicanBasicDeployment
+
+if __name__ == '__main__':
+    deployment = BarbicanBasicDeployment(series='xenial', keystone_version=3,
+                                         openstack='cloud:xenial-ocata',
+                                         source='cloud:xenial-updates/ocata')
+    deployment.run_tests()
diff --git a/src/tests/gate-basic-yakkety-newton b/src/tests/gate-basic-yakkety-newton
old mode 100644
new mode 100755
diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/gate-basic-zesty-ocata
new file mode 100644
index 0000000..601110b
--- /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 BarbicanBasicDeployment
+
+if __name__ == '__main__':
+    deployment = BarbicanBasicDeployment(series='zesty', keystone_version=2)
+    deployment.run_tests()