diff --git a/Makefile b/Makefile
index 53516a0a..8d521531 100644
--- a/Makefile
+++ b/Makefile
@@ -223,7 +223,8 @@ test-all-local: validate-local validate-docs test-unit-local
 
 .PHONY: validate-local
 validate-local:
-	BUILDTAGS="${BUILDTAGS}" hack/make.sh validate-git-marks validate-gofmt
+	BUILDTAGS="${BUILDTAGS}" hack/make.sh validate-git-marks
+	hack/validate-gofmt.sh
 	hack/validate-lint.sh
 	BUILDTAGS="${BUILDTAGS}" hack/validate-vet.sh
 
diff --git a/hack/make/validate-gofmt b/hack/validate-gofmt.sh
similarity index 98%
rename from hack/make/validate-gofmt
rename to hack/validate-gofmt.sh
index b589eb33..72757215 100755
--- a/hack/make/validate-gofmt
+++ b/hack/validate-gofmt.sh
@@ -23,5 +23,5 @@ else
 		echo 'Please reformat the above files using "gofmt -s -w" and commit the result.'
 		echo
 	} >&2
-	false
+	exit 1
 fi