diff --git a/.ci/go-no-os-exit.sh b/.ci/go-no-os-exit.sh
index b429ed5a46..5f0f98436a 100755
--- a/.ci/go-no-os-exit.sh
+++ b/.ci/go-no-os-exit.sh
@@ -15,12 +15,10 @@ echo "Checking for no os.Exit() calls for package [${go_packages}]"
 candidates=`go list -f '{{.Dir}}/*.go' $go_packages`
 for f in $candidates; do
 	filename=`basename $f`
+	# skip all go test files
+	[[ $filename == *_test.go ]] && continue
 	# skip exit.go where, the only file we should call os.Exit() from.
 	[[ $filename == "exit.go" ]] && continue
-	# skip exit_test.go
-	[[ $filename == "exit_test.go" ]] && continue
-	# skip main_test.go
-	[[ $filename == "main_test.go" ]] && continue
 	files="$f $files"
 done