diff --git a/tests/dev-basic-snap-xenial-ocata b/tests/dev-basic-bionic-rocky
similarity index 62%
rename from tests/dev-basic-snap-xenial-ocata
rename to tests/dev-basic-bionic-rocky
index 4ba80b62..696c35a9 100755
--- a/tests/dev-basic-snap-xenial-ocata
+++ b/tests/dev-basic-bionic-rocky
@@ -14,13 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Amulet tests on a basic keystone deployment on xenial-ocata."""
+"""Amulet tests on a basic keystone deployment on bionic-rocky."""
 
-from basic_deployment import KeystoneBasicDeployment
+from basic_deployment import KeystoneV3Deployment
 
 if __name__ == '__main__':
-    deployment = KeystoneBasicDeployment(series='xenial',
-                                         openstack='cloud:xenial-ocata',
-                                         snap_source='snap:ocata/edge',
-                                         source='cloud:xenial-updates/ocata')
+    deployment = KeystoneV3Deployment(series='bionic',
+                                      openstack='cloud:bionic-rocky',
+                                      source='cloud:bionic-updates/rocky')
     deployment.run_tests()
diff --git a/tests/dev-basic-cosmic-rocky b/tests/dev-basic-cosmic-rocky
new file mode 100755
index 00000000..c14ca6c4
--- /dev/null
+++ b/tests/dev-basic-cosmic-rocky
@@ -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 keystone deployment on cosmic-rocky."""
+
+from basic_deployment import KeystoneV3Deployment
+
+if __name__ == '__main__':
+    deployment = KeystoneV3Deployment(series='cosmic')
+    deployment.run_tests()