--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-check-flake8.t	Thu Mar 02 20:13:47 2017 +0100
@@ -0,0 +1,17 @@
+#require test-repo
+
+  $ checkflake8() {
+  >   if ! (which flake8 > /dev/null); then
+  >     echo skipped: missing tool: flake8;
+  >     exit 80;
+  >   fi;
+  > };
+  $ checkflake8
+
+Copied from Mercurial core (60ee2593a270)
+
+  $ cd "`dirname "$TESTDIR"`"
+
+run flake8 if it exists; if it doesn't, then just skip
+
+  $ type flake8 >/dev/null 2>/dev/null && hg files -0 'glob:**.py' | xargs -0 flake8

--- a/tests/test-check-pyflakes.t	Thu Mar 02 20:24:17 2017 +0100
+++ b/tests/test-check-pyflakes.t	Thu Mar 02 20:13:47 2017 +0100
@@ -9,7 +9,3 @@
 
   $ hg locate 'set:**.py or grep("^!#.*python")' 2>/dev/null \
   > | xargs pyflakes 2>/dev/null  
-
-run flake8 if it exists; if it doesn't, then just skip
-
-  $ type flake8 >/dev/null 2>/dev/null && hg files -0 'glob:**.py' | xargs -0 flake8 || true