diff --git a/powerwall.sh b/powerwall.sh
index 65b915e4..a1579f5b 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1490,6 +1490,8 @@ SHUTDOWN_SERVER(){
 				fi
 			done
 			echo
+			[ "${TEST}" != "true" ] && sleep 10s
+			
 		elif [ "${ESXIHOST}" == "10.10.2.17" ]; then
 			echo -e "${idsCL[LightYellow]}Since this is the iSCSI-SYS host server, all iSCSI-SYS VM's are being shutdown ... "
 			for ehost in "${PW_MAINSITE_HOSTS[@]}"; do
@@ -1505,8 +1507,9 @@ SHUTDOWN_SERVER(){
 				fi
 			done
 			echo
+			[ "${TEST}" != "true" ] && sleep 10s
+			
 		fi
-		[ "${TEST}" != "true" ] && sleep 10s
 		
 		MSG="Enabling maintenance mode & starting iSCSI VM migrations"
 		c=0; MSG_SPC=''; spc1=`expr ${hc_cw} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
@@ -1586,6 +1589,7 @@ SHUTDOWN_SERVER(){
 }
 
 HOSTMGMT(){
+	TEST=true
 	echo -e "\n${idsCL[Yellow]}Host Controls${idsCL[Default]}"
 	DIVIDER . yellow 75