diff --git a/zaza/openstack/charm_tests/rabbitmq_server/tests.py b/zaza/openstack/charm_tests/rabbitmq_server/tests.py
index b181519..91aa041 100644
--- a/zaza/openstack/charm_tests/rabbitmq_server/tests.py
+++ b/zaza/openstack/charm_tests/rabbitmq_server/tests.py
@@ -542,6 +542,7 @@ class RmqRotateServiceUserPasswordTests(test_utils.OpenStackBaseTest):
 
         # let everything settle.
         logging.info("Waiting for model to settle.")
+        zaza.model.wait_for_agent_status()
         zaza.model.block_until_all_units_idle()
 
         # verify that the password has changed.