diff --git a/Makefile b/Makefile
index 92727f5b81..d6decfa9c3 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ lint: ## Run linter
 
 .PHONY: test
 test: ## Run tests
-	go test ./...
+	go test -shuffle=on -race ./...
 
 cover: ## Generate coverage report
 	@./hack/test-cover.sh
diff --git a/hack/test-cover.sh b/hack/test-cover.sh
index 1d96418561..85ea09993e 100755
--- a/hack/test-cover.sh
+++ b/hack/test-cover.sh
@@ -4,7 +4,7 @@ set -e
 echo "" >coverage.txt
 
 for d in $(go list ./... | grep -v vendor); do
-    go test -race -coverprofile=profile.out -covermode=atomic $d
+    go test -shuffle=on -race -coverprofile=profile.out -covermode=atomic $d
     if [ -f profile.out ]; then
         cat profile.out >>coverage.txt
         rm profile.out