diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index 9c4d345..196bca5 100644
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -27,6 +27,10 @@
 PARALLEL=1
 endif
 
+ifeq ($(REPEAT),)
+REPEAT=0
+endif
+
 ifeq ($(VPPSRC),)
 VPPSRC=$(shell pwd)/../..
 endif
@@ -64,7 +68,8 @@
 	@echo " TEST=[test-name]         - specific test to run"
 	@echo " CPUS=[n-cpus]            - number of cpus to run with vpp"
 	@echo " VPPSRC=[path-to-vpp-src] - path to vpp source files (for gdb)"
-	@echo " PARALLEL=[n-cpus]"		 - number of test processes to spawn to run in parallel
+	@echo " PARALLEL=[n-cpus]        - number of test processes to spawn to run in parallel"
+	@echo " REPEAT=[n]               - repeat tests up to N times or until a failure occurs"
 	@echo
 	@echo "List of all tests:"
 	$(call list_tests)
@@ -83,7 +88,7 @@
 test: .deps.ok .build.vpp
 	@bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
 		--unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \
-		--vppsrc=$(VPPSRC) --parallel=$(PARALLEL)
+		--vppsrc=$(VPPSRC) --parallel=$(PARALLEL) --repeat=$(REPEAT)
 
 build-go:
 	go build ./tools/http_server
diff --git a/extras/hs-test/test b/extras/hs-test/test
index 9b18e1b..58f08bd 100755
--- a/extras/hs-test/test
+++ b/extras/hs-test/test
@@ -59,6 +59,10 @@
         ;;
     --parallel=*)
         ginkgo_args="$ginkgo_args -procs=${i#*=}"
+        ;;
+    --repeat=*)
+        ginkgo_args="$ginkgo_args --repeat=${i#*=}"
+        ;;
 esac
 done