diff --git a/zaza/openstack/charm_tests/keystone/setup.py b/zaza/openstack/charm_tests/keystone/setup.py
index 7f014250c..a61185f46 100644
--- a/zaza/openstack/charm_tests/keystone/setup.py
+++ b/zaza/openstack/charm_tests/keystone/setup.py
@@ -191,4 +191,5 @@ def wait_for_all_endpoints(interface='public', service_codes=None):
                     requests.codes.ok,
                     requests.codes.multiple_choices,
                     requests.codes.unauthorized,
+                    requests.codes.not_found,
                 ] + service_codes.get(service.name, []))