diff --git a/pre-commit.sh b/pre-commit.sh
index c88607e48..4ebd8824c 100755
--- a/pre-commit.sh
+++ b/pre-commit.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# Make sure, we run in the root of the repo and
+# therefore run the tests on all packages
+base_dir="$( cd "$(dirname "$0")/.." && pwd )"
+cd "$base_dir" || {
+  echo "Cannot cd to '$base_dir'. Aborting." >&2
+  exit 1
+}
+
 rc=0
 
 go_dirs() {
@@ -18,14 +26,12 @@ echo "Running go vet"
 go vet -all ./...
 rc=$((rc || $?))
 
-echo "Running go test"
-go list ./... | grep -vF pkg/framework/test | xargs go test -v
+echo "Installing test binaries"
+./pkg/framework/test/scripts/download-binaries.sh
 rc=$((rc || $?))
 
-echo "Running test framework tests"
-go get github.com/onsi/ginkgo/ginkgo \
-  && ./pkg/framework/test/scripts/download-binaries.sh \
-  && ./pkg/framework/test/scripts/run-tests.sh
+echo "Running go test"
+go test -v ./...
 rc=$((rc || $?))
 
 exit $rc