diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 403301efd1c..dcf3424064b 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -145,7 +145,6 @@
 ./test/images/volume/rbd/create_block.sh
 ./test/images/volume/rbd/mon.sh
 ./test/images/volume/rbd/osd.sh
-./test/kubemark/run-e2e-tests.sh
 ./test/kubemark/start-kubemark.sh
 ./test/kubemark/stop-kubemark.sh
 ./third_party/forked/shell2junit/sh2ju.sh
diff --git a/test/kubemark/run-e2e-tests.sh b/test/kubemark/run-e2e-tests.sh
index d110c34b87a..c9260cb19f6 100755
--- a/test/kubemark/run-e2e-tests.sh
+++ b/test/kubemark/run-e2e-tests.sh
@@ -17,10 +17,10 @@
 export KUBERNETES_PROVIDER="kubemark"
 export KUBE_CONFIG_FILE="config-default.sh"
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
 
 # We need an absolute path to KUBE_ROOT
-ABSOLUTE_ROOT=$(readlink -f ${KUBE_ROOT})
+ABSOLUTE_ROOT=$(readlink -f "${KUBE_ROOT}")
 
 source "${KUBE_ROOT}/cluster/kubemark/util.sh"
 
@@ -32,21 +32,23 @@ export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}"
 export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/resources/kubeconfig.kubemark"
 export E2E_MIN_STARTUP_PODS=0
 
-if [[ -z "$@" ]]; then
-	ARGS='--ginkgo.focus=[Feature:Performance]'
+if [[ -z "$*" ]]; then
+	ARGS=('--ginkgo.focus=[Feature:Performance]')
 else
-	ARGS=$@
+	ARGS=("$@")
 fi
 
 if [[ "${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER}" == "true" ]]; then
-  ARGS="${ARGS} --kubemark-external-kubeconfig=${DEFAULT_KUBECONFIG}"
+  ARGS+=("--kubemark-external-kubeconfig=${DEFAULT_KUBECONFIG}")
 fi
 
 if [[ -f /.dockerenv ]]; then
 	# Running inside a dockerized runner.
-	go run ./hack/e2e.go -- --check-version-skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}"
+	go run ./hack/e2e.go -- --check-version-skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS[*]}"
 else
 	# Running locally.
- 	ARGS=$(echo $ARGS | sed 's/\[/\\\[/g' | sed 's/\]/\\\]/g')
-	${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" "--dump-logs-on-failure=false" $ARGS
+	for ((i=0; i < ${ARGS[@]}; i++)); do
+	  ARGS[$i]="$(echo "ARGS[$i]" | sed -e 's/\[/\\\[/g' -e 's/\]/\\\]/g' )"
+	done
+	"${KUBE_ROOT}/hack/ginkgo-e2e.sh" "--e2e-verify-service-account=false" "--dump-logs-on-failure=false" "${ARGS[@]}"
 fi