diff --git a/build/root/Makefile b/build/root/Makefile
index fd54d4445a8..23f93a30f8b 100644
--- a/build/root/Makefile
+++ b/build/root/Makefile
@@ -213,7 +213,7 @@ define TEST_E2E_NODE_HELP_INFO
 #    Defaults to "\[Flaky\]|\[Slow\]|\[Serial\]".
 #  TEST_ARGS: A space-separated list of arguments to pass to node e2e test.
 #    Defaults to "".
-#  RUN_UNTIL_FAILURE: If true, pass --untilItFails to ginkgo so tests are run
+#  RUN_UNTIL_FAILURE: If true, pass --until-it-fails=true to ginkgo so tests are run
 #    repeatedly until they fail.  Defaults to false.
 #  REMOTE: If true, run the tests on a remote host.  Defaults to false.
 #  REMOTE_MODE: For REMOTE=true only.  Mode for remote execution (eg. gce, ssh).
diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh
index 3263474caba..99a44108996 100755
--- a/hack/ginkgo-e2e.sh
+++ b/hack/ginkgo-e2e.sh
@@ -149,7 +149,7 @@ if [[ -n "${CONFORMANCE_TEST_SKIP_REGEX:-}" ]]; then
 fi
 
 if [[ "${GINKGO_UNTIL_IT_FAILS:-}" == true ]]; then
-  ginkgo_args+=("--untilItFails=true")
+  ginkgo_args+=("--until-it-fails=true")
 fi
 
 FLAKE_ATTEMPTS=1
diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
index f468d36b52f..de2d734f71d 100755
--- a/hack/make-rules/test-e2e-node.sh
+++ b/hack/make-rules/test-e2e-node.sh
@@ -66,8 +66,8 @@ if [[ ${skip} != "" ]]; then
   ginkgoflags="${ginkgoflags} -skip=\"${skip}\" "
 fi
 
-if [[ ${run_until_failure} != "" ]]; then
-  ginkgoflags="${ginkgoflags} -untilItFails=${run_until_failure} "
+if [[ ${run_until_failure} == "true" ]]; then
+  ginkgoflags="${ginkgoflags} --until-it-fails=true "
 fi
 
 # Setup the directory to copy test artifacts (logs, junit.xml, etc) from remote host to local host