diff --git a/zaza/openstack/charm_tests/kerberos/setup.py b/zaza/openstack/charm_tests/kerberos/setup.py
index fadd7a9..d441f8c 100644
--- a/zaza/openstack/charm_tests/kerberos/setup.py
+++ b/zaza/openstack/charm_tests/kerberos/setup.py
@@ -113,6 +113,7 @@ def retrieve_and_attach_keytab():
                                    'keystone_keytab',
                                    tmp_file)
 
+    zaza.model.wait_for_application_states()
     zaza.model.block_until_all_units_idle()