diff --git a/Makefile b/Makefile
index f3b90b9c4f..bf0f0dd66d 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ v8:
 
 test: | build-addons cctest  # Both targets depend on 'all'.
 	$(PYTHON) tools/test.py --mode=release -J \
-		addon doctool message parallel sequential
+		addon doctool known_issues message parallel sequential
 	$(MAKE) lint
 
 test-parallel: all
@@ -176,7 +176,7 @@ test-all-valgrind: test-build
 test-ci: | build-addons
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
 		--mode=release --flaky-tests=$(FLAKY_TESTS) \
-		$(TEST_CI_ARGS) addons doctool message parallel sequential
+		$(TEST_CI_ARGS) addons doctool known_issues message parallel sequential
 
 test-release: test-build
 	$(PYTHON) tools/test.py --mode=release
@@ -200,7 +200,7 @@ test-debugger: all
 	$(PYTHON) tools/test.py debugger
 
 test-known-issues: all
-	$(PYTHON) tools/test.py known_issues --expect-fail
+	$(PYTHON) tools/test.py known_issues
 
 test-npm: $(NODE_EXE)
 	NODE=$(NODE) tools/test-npm.sh
diff --git a/test/known_issues/testcfg.py b/test/known_issues/testcfg.py
index af4f56574b..d8d2ba22b5 100644
--- a/test/known_issues/testcfg.py
+++ b/test/known_issues/testcfg.py
@@ -1,6 +1,9 @@
 import sys, os
+import copy
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import testpy
 
 def GetConfiguration(context, root):
-  return testpy.SimpleTestConfiguration(context, root, 'known_issues')
+  myContext = copy.copy(context)
+  myContext.expect_fail = 1
+  return testpy.SimpleTestConfiguration(myContext, root, 'known_issues')
diff --git a/vcbuild.bat b/vcbuild.bat
index cceb815a05..259e0d4d5d 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -55,8 +55,8 @@ if /i "%1"=="nosnapshot"    set nosnapshot=1&goto arg-ok
 if /i "%1"=="noetw"         set noetw=1&goto arg-ok
 if /i "%1"=="noperfctr"     set noperfctr=1&goto arg-ok
 if /i "%1"=="licensertf"    set licensertf=1&goto arg-ok
-if /i "%1"=="test"          set test_args=%test_args% addons doctool sequential parallel message -J&set jslint=1&set build_addons=1&goto arg-ok
-if /i "%1"=="test-ci"       set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool message sequential parallel&set build_addons=1&goto arg-ok
+if /i "%1"=="test"          set test_args=%test_args% addons doctool known_issues message parallel sequential -J&set jslint=1&set build_addons=1&goto arg-ok
+if /i "%1"=="test-ci"       set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool known_issues message sequential parallel&set build_addons=1&goto arg-ok
 if /i "%1"=="test-addons"   set test_args=%test_args% addons&set build_addons=1&goto arg-ok
 if /i "%1"=="test-simple"   set test_args=%test_args% sequential parallel -J&goto arg-ok
 if /i "%1"=="test-message"  set test_args=%test_args% message&goto arg-ok
@@ -64,7 +64,7 @@ if /i "%1"=="test-gc"       set test_args=%test_args% gc&set buildnodeweak=1&got
 if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
 if /i "%1"=="test-pummel"   set test_args=%test_args% pummel&goto arg-ok
 if /i "%1"=="test-all"      set test_args=%test_args% sequential parallel message gc internet pummel&set buildnodeweak=1&set jslint=1&goto arg-ok
-if /i "%1"=="test-known-issues" set test_args=%test_args% known_issues --expect-fail&goto arg-ok
+if /i "%1"=="test-known-issues" set test_args=%test_args% known_issues&goto arg-ok
 if /i "%1"=="jslint"        set jslint=1&goto arg-ok
 if /i "%1"=="jslint-ci"     set jslint_ci=1&goto arg-ok
 if /i "%1"=="msi"           set msi=1&set licensertf=1&set download_arg="--download=all"&set i18n_arg=small-icu&goto arg-ok