diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index 05e03b8..42ccd56 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2016 Canonical Ltd
 #
diff --git a/src/tests/gate-basic-xenial-ocata b/src/tests/gate-basic-xenial-ocata
new file mode 100644
index 0000000..2567599
--- /dev/null
+++ b/src/tests/gate-basic-xenial-ocata
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Amulet tests on a basic openvswitch ODL deployment on xenial-ocata."""
+
+from basic_deployment import OVSODLBasicDeployment
+
+if __name__ == '__main__':
+    deployment = OVSODLBasicDeployment(series='xenial',
+                                       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..b3ea6c9
--- /dev/null
+++ b/src/tests/gate-basic-zesty-ocata
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Amulet tests on a basic openvswitch ODL deployment on zesty-ocata."""
+
+from basic_deployment import OVSODLBasicDeployment
+
+if __name__ == '__main__':
+    deployment = OVSODLBasicDeployment(series='zesty',
+                                       odl_version='beryllium')
+    deployment.run_tests()