diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 5fd81f02349..746c600dffb 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -874,7 +874,7 @@ kube::golang::build_binaries() {
         cat "/tmp//${platform//\//_}.build"
       done
 
-      exit ${fails}
+      exit "${fails}"
     else
       for platform in "${platforms[@]}"; do
         kube::log::status "Building go targets for ${platform}:" "${targets[@]}"
diff --git a/test/cmd/core.sh b/test/cmd/core.sh
index a2ffc056dbf..cbc87de7ad3 100755
--- a/test/cmd/core.sh
+++ b/test/cmd/core.sh
@@ -560,7 +560,7 @@ run_pod_tests() {
   resourceVersion=$(kubectl get "${kube_flags[@]}" pod valid-pod -o go-template='{{ .metadata.resourceVersion }}')
   ((resourceVersion+=100))
   # Command
-  kubectl patch "${kube_flags[@]}" pod valid-pod -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "nginx"}]},"metadata":{"resourceVersion":"'$resourceVersion'"}}' 2> "${ERROR_FILE}" || true
+  kubectl patch "${kube_flags[@]}" pod valid-pod -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "nginx"}]},"metadata":{"resourceVersion":"'"$resourceVersion"'"}}' 2> "${ERROR_FILE}" || true
   # Post-condition: should get an error reporting the conflict
   if grep -q "please apply your changes to the latest version and try again" "${ERROR_FILE}"; then
     kube::log::status "\"kubectl patch with resourceVersion $resourceVersion\" returns error as expected: $(cat "${ERROR_FILE}")"
diff --git a/test/images/pets/zookeeper-installer/on-start.sh b/test/images/pets/zookeeper-installer/on-start.sh
index b478a5a1f5e..66e5bd2faf3 100755
--- a/test/images/pets/zookeeper-installer/on-start.sh
+++ b/test/images/pets/zookeeper-installer/on-start.sh
@@ -60,7 +60,7 @@ for peer in "${PEERS[@]}"; do
     if [[ "${peer}" == *"${HOSTNAME}"* ]]; then
       MY_ID=$i
       MY_NAME=${peer}
-      echo $i > "${MY_ID_FILE}"
+      echo "$i" > "${MY_ID_FILE}"
       echo "server.${i}=${peer}:2888:3888:observer;2181" >> "${CFG_BAK}"
     else
       if [[ $(echo srvr | /opt/nc "${peer}" 2181 | grep Mode) = "Mode: leader" ]]; then
@@ -95,10 +95,10 @@ ADD_SERVER="server.$MY_ID=$MY_NAME:2888:3888:participant;0.0.0.0:2181"
 # Prove that we've actually joined the running cluster
 ITERATION=0
 until echo config | /opt/nc localhost 2181 | grep "${ADD_SERVER}" > /dev/null; do
-  echo $ITERATION] waiting for updated config to sync back to localhost
+  echo "$ITERATION"] waiting for updated config to sync back to localhost
   sleep 1
   (( ITERATION=ITERATION+1 ))
-  if [ $ITERATION -eq 20 ]; then
+  if [ "$ITERATION" -eq 20 ]; then
     exit 1
   fi
 done