diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 03984b1..bef19ea 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -123,6 +123,7 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment):
         # Make config change, check for service restarts
         u.log.debug('Setting preferred-api-version={}'.format(api_version))
         self.d.configure('keystone', set_alternate)
+        self._auto_wait_for_status(exclude_services=self.exclude_services)
         self.keystone_api_version = api_version
         client = self.get_keystone_client(api_version=api_version)
         # List an artefact that needs authorisation to check admin user