diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 129f60a1..9f49f936 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
 # We need base DevStack functions for this
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
+
 source $BASE_DEVSTACK_DIR/lib/tls
 source $BASE_DEVSTACK_DIR/lib/sahara
 
@@ -18,4 +19,4 @@ set -o xtrace
 stop_sahara
 
 # sanity check that service is actually down
-ensure_services_stopped sahara
+ensure_services_stopped sahara-all