diff --git a/Makefile b/Makefile
index 0785fdb2e..5daa8d70d 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ ACCEPTANCE_RUN_TESTS=.
 PKG         := ./...
 TAGS        :=
 TESTS       := .
+TESTARGS    := -shuffle=on -count=3
 TESTFLAGS   :=
 LDFLAGS     := -w -s
 GOFLAGS     :=
@@ -104,7 +105,7 @@ test: test-unit
 test-unit:
 	@echo
 	@echo "==> Running unit tests <=="
-	go test $(GOFLAGS) -run $(TESTS) $(PKG) $(TESTFLAGS)
+	go test $(GOFLAGS) -run $(TESTS) $(PKG) $(TESTFLAGS) $(TESTARGS)
 	@echo
 	@echo "==> Running unit test(s) with ldflags <=="
 # Test to check the deprecation warnings on Kubernetes templates created by `helm create` against the current Kubernetes