diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 198c56f659..282887d0c0 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -37,9 +37,6 @@
 ./cluster/test-smoke.sh
 ./cluster/update-storage-objects.sh
 ./cluster/validate-cluster.sh
-./hack/benchmark-go.sh
-./hack/build-cross.sh
-./hack/build-go.sh
 ./hack/cherry_pick_pull.sh
 ./hack/generate-bindata.sh
 ./hack/generate-docs.sh
@@ -77,10 +74,8 @@
 ./hack/make-rules/update.sh
 ./hack/make-rules/verify.sh
 ./hack/make-rules/vet.sh
-./hack/test-go.sh
 ./hack/test-integration.sh
 ./hack/test-update-storage-objects.sh
-./hack/update-all.sh
 ./hack/update-bazel.sh
 ./hack/update-codegen.sh
 ./hack/update-generated-kms-dockerized.sh
@@ -95,7 +90,6 @@
 ./hack/update-staging-godeps.sh
 ./hack/update-translations.sh
 ./hack/update-workspace-mirror.sh
-./hack/verify-all.sh
 ./hack/verify-api-groups.sh
 ./hack/verify-boilerplate.sh
 ./hack/verify-cli-conventions.sh
diff --git a/hack/benchmark-go.sh b/hack/benchmark-go.sh
index 17aa8c56fa..7a16d68f9a 100755
--- a/hack/benchmark-go.sh
+++ b/hack/benchmark-go.sh
@@ -18,8 +18,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-
 make test \
     WHAT="$*" \
     KUBE_COVER="" \
diff --git a/hack/build-cross.sh b/hack/build-cross.sh
index 00199528c8..ce14beed7e 100755
--- a/hack/build-cross.sh
+++ b/hack/build-cross.sh
@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 echo "NOTE: $0 has been replaced by 'make cross'"
 echo
diff --git a/hack/build-go.sh b/hack/build-go.sh
index a2ff893998..bd70926614 100755
--- a/hack/build-go.sh
+++ b/hack/build-go.sh
@@ -20,12 +20,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # For help output
 ARGHELP=""
 if [[ "$#" -gt 0 ]]; then
-    ARGHELP="WHAT='$@'"
+    ARGHELP="WHAT='$*'"
 fi
 
 echo "NOTE: $0 has been replaced by 'make' or 'make all'"
diff --git a/hack/test-go.sh b/hack/test-go.sh
index 380e8d18d4..d13946d860 100755
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -20,12 +20,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # For help output
 ARGHELP=""
 if [[ "$#" -gt 0 ]]; then
-    ARGHELP="WHAT='$@'"
+    ARGHELP="WHAT='$*'"
 fi
 
 echo "NOTE: $0 has been replaced by 'make test'"
diff --git a/hack/update-all.sh b/hack/update-all.sh
index ba4311f1c8..073311424f 100755
--- a/hack/update-all.sh
+++ b/hack/update-all.sh
@@ -21,7 +21,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 echo "NOTE: $0 has been replaced by 'make update'"
 echo
diff --git a/hack/verify-all.sh b/hack/verify-all.sh
index 75ab1e9e92..c66f23e683 100755
--- a/hack/verify-all.sh
+++ b/hack/verify-all.sh
@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # For help output
 ARGHELP=""