diff --git a/src/metadata.yaml b/src/metadata.yaml
index 5f0b511..591b1b2 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -11,6 +11,7 @@ tags:
   - misc
 series:
   - xenial
+  - zesty
   - yakkety
 subordinate: false
 requires:
diff --git a/src/tests/gate-basic-xenial-ocata b/src/tests/gate-basic-xenial-ocata
new file mode 100755
index 0000000..141a3d8
--- /dev/null
+++ b/src/tests/gate-basic-xenial-ocata
@@ -0,0 +1,23 @@
+#!/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 ceph deployment on xenial-ocata."""
+
+from basic_deployment import CephFsBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephFsBasicDeployment(series='xenial')
+    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..dce0829
--- /dev/null
+++ b/src/tests/gate-basic-zesty-ocata
@@ -0,0 +1,23 @@
+#!/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 ceph deployment on zesty-ocata."""
+
+from basic_deployment import CephFsBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephFsBasicDeployment(series='zesty')
+    deployment.run_tests()
diff --git a/src/tox.ini b/src/tox.ini
index 479d7bb..3bc4d0b 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          AMULET_SETUP_TIMEOUT=2700
 whitelist_externals = juju
-passenv = HOME TERM AMULET_*
+passenv = HOME TERM AMULET_* CS_API_URL
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
   pip install --allow-unverified python-apt {opts} {packages}