diff --git a/run-tests.xsh b/run-tests.xsh
index 5d915845c..a81cf1e3f 100755
--- a/run-tests.xsh
+++ b/run-tests.xsh
@@ -27,4 +27,5 @@ for fname in run_separately:
 for index, fname in enumerate(run_separately):
     ![pytest @(replace_args(index+1)) @(fname)]
 echo "---------- Running flake8 ----------"
+$RAISE_SUBPROC_ERROR = False
 python -m flake8
diff --git a/setup.cfg b/setup.cfg
index 3dd784554..6cb731068 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -52,7 +52,7 @@ per-file-ignores =
     xonsh/readline_shell.py:F401,
     xonsh/style_tools.py:F821 E305,
     xonsh/timings.py:F401,
-    xonsh/tokenize.py:F821 F841,
+#    xonsh/tokenize.py:F821 F841,
     xonsh/tools.py:E731 E305,
     xonsh/xonfig.py:E731,
     xontrib/vox.py:F821,