diff --git a/src/tests/dev-basic-bionic-rocky b/src/tests/dev-basic-bionic-rocky
new file mode 100755
index 0000000..5448512
--- /dev/null
+++ b/src/tests/dev-basic-bionic-rocky
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on bionic-rocky for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='bionic', keystone_version=3,
+                                        openstack='cloud:bionic-rocky',
+                                        source='cloud:bionic-updates/rocky')
+    deployment.run_tests()
diff --git a/src/tests/dev-basic-cosmic-rocky b/src/tests/dev-basic-cosmic-rocky
new file mode 100755
index 0000000..8d88ebd
--- /dev/null
+++ b/src/tests/dev-basic-cosmic-rocky
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic aodh deployment on cosmic-rocky for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='cosmic', keystone_version=3)
+    deployment.run_tests()
diff --git a/src/tests/dev-basic-xenial-queens b/src/tests/dev-basic-xenial-queens
deleted file mode 100755
index ada996f..0000000
--- a/src/tests/dev-basic-xenial-queens
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-"""Amulet tests on a basic barbican deploy on xenial-queens for keystone v3.
-"""
-
-from basic_deployment import SoftHSMBasicDeployment
-
-if __name__ == '__main__':
-    deployment = SoftHSMBasicDeployment(series='xenial', keystone_version=3,
-                                        openstack='cloud:xenial-queens',
-                                        source='cloud:xenial-updates/queens')
-    deployment.run_tests()