diff --git a/src/tests/dev-basic-disco-stein b/src/tests/dev-basic-disco-stein
new file mode 100755
index 0000000..77de339
--- /dev/null
+++ b/src/tests/dev-basic-disco-stein
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+#
+# Copyright 2017 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 LDAP Charm deployment on disco-stein."""
+
+from basic_deployment import KeystoneLDAPCharmDeployment
+
+if __name__ == '__main__':
+    deployment = KeystoneLDAPCharmDeployment(series='disco')
+    deployment.run_tests()
diff --git a/src/tests/gate-basic-bionic-stein b/src/tests/gate-basic-bionic-stein
new file mode 100755
index 0000000..2a7cf03
--- /dev/null
+++ b/src/tests/gate-basic-bionic-stein
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+#
+# Copyright 2017 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 LDAP Charm deployment on bionic-mitaka."""
+
+from basic_deployment import KeystoneLDAPCharmDeployment
+
+if __name__ == '__main__':
+    deployment = KeystoneLDAPCharmDeployment(series='bionic',
+                                             openstack='cloud:bionic-stein')
+    deployment.run_tests()