diff --git a/zaza/charm_tests/test_utils.py b/zaza/charm_tests/test_utils.py
index 1aacbbf..9c83e77 100644
--- a/zaza/charm_tests/test_utils.py
+++ b/zaza/charm_tests/test_utils.py
@@ -110,6 +110,8 @@ class OpenStackBaseTest(unittest.TestCase):
             model.wait_for_application_states(
                 model_name=self.model_name,
                 states=self.test_config.get('target_deploy_status', {}))
+            # TODO: Optimize with a block on a specific application until idle.
+            model.block_until_all_units_idle()
 
             yield
 
@@ -124,6 +126,8 @@ class OpenStackBaseTest(unittest.TestCase):
         model.wait_for_application_states(
             model_name=self.model_name,
             states=self.test_config.get('target_deploy_status', {}))
+        # TODO: Optimize with a block on a specific application until idle.
+        model.block_until_all_units_idle()
 
     def restart_on_changed(self, config_file, default_config, alternate_config,
                            default_entry, alternate_entry, services):