diff --git a/labs/scripts/setup_cinder_controller.sh b/labs/scripts/setup_cinder_controller.sh
index ab41d170..ce10bce3 100755
--- a/labs/scripts/setup_cinder_controller.sh
+++ b/labs/scripts/setup_cinder_controller.sh
@@ -103,23 +103,3 @@ echo "Restarting cinder service."
 sudo service cinder-scheduler restart
 sudo service cinder-api restart
 
-#------------------------------------------------------------------------------
-# Verify the Block Storage installation
-#------------------------------------------------------------------------------
-
-echo "Waiting for cinder to start."
-until cinder list >/dev/null 2>&1; do
-    sleep 1
-done
-
-echo "cinder create --display-name labsVolume 1"
-cinder create --display-name labsVolume 1
-
-echo "cinder list"
-cinder list
-
-echo "cinder delete labsVolume"
-cinder delete labsVolume
-
-echo "cinder list"
-cinder list
diff --git a/labs/scripts/setup_cinder_volumes.sh b/labs/scripts/setup_cinder_volumes.sh
index ac8d6fe0..ff6d0a85 100755
--- a/labs/scripts/setup_cinder_volumes.sh
+++ b/labs/scripts/setup_cinder_volumes.sh
@@ -79,3 +79,25 @@ iniset_sudo $conf DEFAULT glance_host controller-mgmt
 echo "Restarting cinder service."
 sudo service cinder-volume restart
 sudo service tgt restart
+
+#------------------------------------------------------------------------------
+# Verify the Block Storage installation
+#------------------------------------------------------------------------------
+
+echo "Waiting for cinder to start."
+until cinder list >/dev/null 2>&1; do
+    sleep 1
+done
+
+echo "cinder create --display-name labsVolume 1"
+cinder create --display-name labsVolume 1
+
+echo "cinder list"
+cinder list
+
+echo "cinder delete labsVolume"
+cinder delete labsVolume
+
+echo "cinder list"
+cinder list
+