diff --git a/stack.sh b/stack.sh
index 29e495378b..b148d53481 100755
--- a/stack.sh
+++ b/stack.sh
@@ -935,9 +935,6 @@ fi
 if is_service_enabled cinder; then
     configure_cinder
 fi
-if is_service_enabled tempest; then
-    configure_tempest
-fi
 if is_service_enabled ryu || (is_service_enabled quantum && [[ "$Q_PLUGIN" = "ryu" ]]); then
     setup_develop $RYU_DIR
 fi
@@ -2055,6 +2052,13 @@ if is_service_enabled g-reg; then
 fi
 
 
+# Configure Tempest last to ensure that the runtime configuration of
+# the various OpenStack services can be queried.
+if is_service_enabled tempest; then
+    configure_tempest
+fi
+
+
 # Run local script
 # ================