diff --git a/hooks/osd-relation-joined b/hooks/osd-relation-joined
new file mode 120000
index 00000000..52d96630
--- /dev/null
+++ b/hooks/osd-relation-joined
@@ -0,0 +1 @@
+ceph_hooks.py
\ No newline at end of file
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 3503f2d1..7b1d9c15 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -26,6 +26,11 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
         self._add_relations()
         self._configure_services()
         self._deploy()
+        
+        u.log.info('Waiting on extended status checks...')
+        exclude_services = ['mysql']
+        self._auto_wait_for_status(exclude_services=exclude_services)
+
         self._initialize_tests()
 
     def _add_services(self):