diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index da77d42d..3b247d3a 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -40,8 +40,6 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
     relations, service status, endpoint service catalog, create and
     delete new image."""
 
-    SERVICES = ('apache2', 'haproxy', 'glance-api', 'glance-registry')
-
     def __init__(self, series=None, openstack=None, source=None,
                  stable=False):
         """Deploy the entire test environment."""
@@ -60,8 +58,13 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
         self._initialize_tests()
 
     def _assert_services(self, should_run):
+        if self._get_openstack_release() >= self.bionic_stein:
+            services = ('apache2', 'haproxy', 'glance-api')
+        else:
+            services = ('apache2', 'haproxy', 'glance-api', 'glance-registry')
+
         u.get_unit_process_ids(
-            {self.glance_sentry: self.SERVICES},
+            {self.glance_sentry: services},
             expect_success=should_run)
 
     def _add_services(self):
@@ -143,9 +146,14 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
            corresponding service units."""
         services = {
             self.keystone_sentry: ['keystone'],
-            self.glance_sentry: ['glance-api', 'glance-registry'],
-            self.rabbitmq_sentry: ['rabbitmq-server']
+            self.rabbitmq_sentry: ['rabbitmq-server'],
         }
+        if self._get_openstack_release() >= self.bionic_stein:
+            services.update(
+                {self.glance_sentry: ['glance-api']})
+        else:
+            services.update(
+                {self.glance_sentry: ['glance-api', 'glance-registry']})
         if self._get_openstack_release() >= self.trusty_liberty:
             services[self.keystone_sentry] = ['apache2']
         ret = u.validate_services_by_name(services)
@@ -262,10 +270,11 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
                             '/etc/glance/glance-api.conf',
                             self._get_openstack_release(),
                             earliest_release=self.trusty_mitaka)
-        u.validate_memcache(self.glance_sentry,
-                            '/etc/glance/glance-registry.conf',
-                            self._get_openstack_release(),
-                            earliest_release=self.trusty_mitaka)
+        if self._get_openstack_release() < self.bionic_stein:
+            u.validate_memcache(self.glance_sentry,
+                                '/etc/glance/glance-registry.conf',
+                                self._get_openstack_release(),
+                                earliest_release=self.trusty_mitaka)
 
     def test_200_mysql_glance_db_relation(self):
         """Verify the mysql:glance shared-db relation data"""
@@ -373,6 +382,10 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
 
     def test_302_glance_registry_default_config(self):
         """Verify configs in glance-registry.conf"""
+        if self._get_openstack_release() >= self.bionic_stein:
+            u.log.debug('Skipping check of glance registry config file for '
+                        '>= bionic-stein')
+            return
         u.log.debug('Checking glance registry config file...')
         unit = self.glance_sentry
         rel_my_gl = self.pxc_sentry.relation('shared-db', 'glance:shared-db')
@@ -491,8 +504,9 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
         # Services which are expected to restart upon config change
         services = {
             'glance-api': conf_file,
-            'glance-registry': conf_file,
         }
+        if self._get_openstack_release() < self.bionic_stein:
+            services.update({'glance-registry': conf_file})
 
         # Make config change, check for service restarts
         u.log.debug('Making config change on {}...'.format(juju_service))
diff --git a/tests/dev-basic-disco-stein b/tests/dev-basic-disco-stein
new file mode 100755
index 00000000..3a7b6d50
--- /dev/null
+++ b/tests/dev-basic-disco-stein
@@ -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 Glance deployment on disco-stein."""
+
+from basic_deployment import GlanceBasicDeployment
+
+if __name__ == '__main__':
+    deployment = GlanceBasicDeployment(series='disco')
+    deployment.run_tests()
diff --git a/tests/gate-basic-bionic-stein b/tests/gate-basic-bionic-stein
new file mode 100755
index 00000000..f364db29
--- /dev/null
+++ b/tests/gate-basic-bionic-stein
@@ -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 glance deployment on bionic-stein."""
+
+from basic_deployment import GlanceBasicDeployment
+
+if __name__ == '__main__':
+    deployment = GlanceBasicDeployment(series='bionic',
+                                         openstack='cloud:bionic-stein',
+                                         source='cloud:bionic-stein')
+    deployment.run_tests()