diff --git a/Makefile b/Makefile
index 1101977916da2e..9a0578d52605d1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ PYTHON ?= python
 DESTDIR ?=
 SIGN ?=
 PREFIX ?= /usr/local
+FLAKY_TESTS ?= run
 STAGINGSERVER ?= iojs-www
 
 OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
@@ -140,7 +141,7 @@ test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
 test-ci: | build-addons
-	$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release \
+	$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --flaky-tests=$(FLAKY_TESTS) \
 		addons message parallel sequential
 
 test-release: test-build
diff --git a/vcbuild.bat b/vcbuild.bat
index 088473e1e462ff..15609079dbe254 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -70,6 +70,7 @@ if /i "%1"=="small-icu"     set i18n_arg=%1&goto arg-ok
 if /i "%1"=="full-icu"      set i18n_arg=%1&goto arg-ok
 if /i "%1"=="intl-none"     set i18n_arg=%1&goto arg-ok
 if /i "%1"=="download-all"  set download_arg="--download=all"&goto arg-ok
+if /i "%1"=="ignore-flaky"  set test_args=%test_args% --flaky-tests=dontcare&goto arg-ok
 
 echo Warning: ignoring invalid command line option `%1`.