diff --git a/tests/018-basic-trusty-liberty b/tests/018-basic-trusty-liberty
old mode 100644
new mode 100755
diff --git a/tests/019-basic-trusty-mitaka b/tests/019-basic-trusty-mitaka
old mode 100644
new mode 100755
diff --git a/tests/020-basic-wily-liberty b/tests/020-basic-wily-liberty
old mode 100644
new mode 100755
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 95fa404f..b879a608 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
 import amulet
-import time
 from charmhelpers.contrib.openstack.amulet.deployment import (
     OpenStackAmuletDeployment
 )
@@ -26,6 +25,13 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
         self._add_relations()
         self._configure_services()
         self._deploy()
+
+        u.log.info('Waiting on extended status checks...')
+        exclude_services = ['mysql']
+
+        # Wait for deployment ready msgs, except exclusions
+        self._auto_wait_for_status(exclude_services=exclude_services)
+
         self._initialize_tests()
 
     def _add_services(self):
@@ -108,9 +114,6 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
         u.log.debug('openstack release str: {}'.format(
             self._get_openstack_release_string()))
 
-        # Let things settle a bit original moving forward
-        time.sleep(30)
-
         # Authenticate admin with keystone
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',