diff --git a/Makefile b/Makefile
index 2606e6ae8..d4c844ae3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,12 @@ ACCEPTANCE_RUN_TESTS=.
 PKG         := ./...
 TAGS        :=
 TESTS       := .
-TESTFLAGS   :=
+TESTFLAGS   := -shuffle=on
+ifneq ($(TESTCOUNT),)
+TESTFLAGS += -count=$(TESTCOUNT)
+else
+TESTFLAGS += -count=1
+endif
 LDFLAGS     := -w -s
 GOFLAGS     :=
 CGO_ENABLED ?= 0