diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py
index 9ba6955..e6eca75 100644
--- a/zaza/openstack/charm_tests/test_utils.py
+++ b/zaza/openstack/charm_tests/test_utils.py
@@ -267,6 +267,9 @@ class BaseCharmTest(unittest.TestCase):
                 self._stringed_value_config(default_config),
                 model_name=self.model_name)
 
+        logging.debug(
+            'Waiting for units to execute config-changed hook')
+        model.wait_for_agent_status(model_name=self.model_name)
         logging.debug(
             'Waiting for units to reach target states')
         model.wait_for_application_states(