diff --git a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh
index c9c988a145..cbe64e31a4 100755
--- a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh
+++ b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh
@@ -13,27 +13,27 @@ unset LD_LIBRARY_PATH
 
 clear
 
-if [ ! -f $DOCKER_MACHINE ] || [ ! -f $VBOXMANAGE ]; then
+if [ ! -f "${DOCKER_MACHINE}" ] || [ ! -f "${VBOXMANAGE}" ]; then
   echo "Either VirtualBox or Docker Machine are not installed. Please re-run the Toolbox Installer and try again."
   exit 1
 fi
 
-$VBOXMANAGE showvminfo $VM &> /dev/null
+"${VBOXMANAGE}" list vms | grep \""${VM}"\" &> /dev/null
 VM_EXISTS_CODE=$?
 
 if [ $VM_EXISTS_CODE -eq 1 ]; then
-  $DOCKER_MACHINE rm -f $VM &> /dev/null
-  rm -rf ~/.docker/machine/machines/$VM
-  $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 --virtualbox-disk-size 204800 $VM
+  "${DOCKER_MACHINE}" rm -f "${VM}" &> /dev/null
+  rm -rf ~/.docker/machine/machines/"${VM}"
+  "${DOCKER_MACHINE}" create -d virtualbox --virtualbox-memory 2048 --virtualbox-disk-size 204800 "${VM}"
 fi
 
-VM_STATUS=$($DOCKER_MACHINE status $VM 2>&1)
-if [ "$VM_STATUS" != "Running" ]; then
-  $DOCKER_MACHINE start $VM
-  yes | $DOCKER_MACHINE regenerate-certs $VM
+VM_STATUS="$(${DOCKER_MACHINE} status ${VM} 2>&1)"
+if [ "${VM_STATUS}" != "Running" ]; then
+  "${DOCKER_MACHINE}" start "${VM}"
+  yes | "${DOCKER_MACHINE}" regenerate-certs "${VM}"
 fi
 
-eval $($DOCKER_MACHINE env --shell=bash $VM)
+eval "$(${DOCKER_MACHINE} env --shell=bash ${VM})"
 
 clear
 cat << EOF
@@ -50,13 +50,13 @@ cat << EOF
 
 
 EOF
-echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}$VM${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip $VM)${NC}"
+echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}${VM}${NC} machine with IP ${GREEN}$(${DOCKER_MACHINE} ip ${VM})${NC}"
 echo "For help getting started, check out the docs at https://docs.docker.com"
 echo
 
-USER_SHELL=$(dscl /Search -read /Users/$USER UserShell | awk '{print $2}' | head -n 1)
-if [[ $USER_SHELL == *"/bash"* ]] || [[ $USER_SHELL == *"/zsh"* ]] || [[ $USER_SHELL == *"/sh"* ]]; then
-  $USER_SHELL --login
+USER_SHELL="$(dscl /Search -read /Users/${USER} UserShell | awk '{print $2}' | head -n 1)"
+if [[ "${USER_SHELL}" == *"/bash"* ]] || [[ "${USER_SHELL}" == *"/zsh"* ]] || [[ "${USER_SHELL}" == *"/sh"* ]]; then
+  "${USER_SHELL}" --login
 else
-  $USER_SHELL
+  "${USER_SHELL}"
 fi
diff --git a/windows/start.sh b/windows/start.sh
index 07200b6fbd..38736bd887 100644
--- a/windows/start.sh
+++ b/windows/start.sh
@@ -6,38 +6,38 @@ VM=default
 DOCKER_MACHINE=./docker-machine.exe
 
 if [ ! -z "$VBOX_MSI_INSTALL_PATH" ]; then
-  VBOXMANAGE=${VBOX_MSI_INSTALL_PATH}VBoxManage.exe
+  VBOXMANAGE="${VBOX_MSI_INSTALL_PATH}VBoxManage.exe"
 else
-  VBOXMANAGE=${VBOX_INSTALL_PATH}VBoxManage.exe
+  VBOXMANAGE="${VBOX_INSTALL_PATH}VBoxManage.exe"
 fi
 
 BLUE='\033[1;34m'
 GREEN='\033[0;32m'
 NC='\033[0m'
 
-if [ ! -f $DOCKER_MACHINE ] || [ ! -f "${VBOXMANAGE}" ]; then
+if [ ! -f "${DOCKER_MACHINE}" ] || [ ! -f "${VBOXMANAGE}" ]; then
   echo "Either VirtualBox or Docker Machine are not installed. Please re-run the Toolbox Installer and try again."
   exit 1
 fi
 
-"${VBOXMANAGE}" showvminfo $VM &> /dev/null
+"${VBOXMANAGE}" list vms | grep \""${VM}"\" &> /dev/null
 VM_EXISTS_CODE=$?
 
 set -e
 
 if [ $VM_EXISTS_CODE -eq 1 ]; then
-  $DOCKER_MACHINE rm -f $VM &> /dev/null || :
-  rm -rf ~/.docker/machine/machines/$VM
-  $DOCKER_MACHINE create -d virtualbox $VM
+  "${DOCKER_MACHINE}" rm -f "${VM}" &> /dev/null || :
+  rm -rf ~/.docker/machine/machines/"${VM}"
+  "${DOCKER_MACHINE}" create -d virtualbox "${VM}"
 fi
 
-VM_STATUS=$($DOCKER_MACHINE status $VM 2>&1)
-if [ "$VM_STATUS" != "Running" ]; then
-  $DOCKER_MACHINE start $VM
-  yes | $DOCKER_MACHINE regenerate-certs $VM
+VM_STATUS="$(${DOCKER_MACHINE} status ${VM} 2>&1)"
+if [ "${VM_STATUS}" != "Running" ]; then
+  "${DOCKER_MACHINE}" start "${VM}"
+  yes | "${DOCKER_MACHINE}" regenerate-certs "${VM}"
 fi
 
-eval "$($DOCKER_MACHINE env --shell=bash $VM)"
+eval "$(${DOCKER_MACHINE} env --shell=bash ${VM})"
 
 clear
 cat << EOF
@@ -53,7 +53,7 @@ cat << EOF
               \____\_______/
 
 EOF
-echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}$VM${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip $VM)${NC}"
+echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}${VM}${NC} machine with IP ${GREEN}$(${DOCKER_MACHINE} ip ${VM})${NC}"
 echo "For help getting started, check out the docs at https://docs.docker.com"
 echo
 cd
@@ -63,4 +63,4 @@ docker () {
 }
 export -f docker
 
-exec "$BASH" --login -i
+exec "${BASH}" --login -i