diff --git a/tools/test-requires b/tools/test-requires
index e5c86ef3..2bda8dba 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,10 +1,15 @@
 distribute>=0.6.24
 
+# Install bounded pep8/pyflakes first, then let flake8 install
+pep8==1.4.5
+pyflakes==0.7.2
+flake8==2.0
+hacking>=0.5.3,<0.6
+
 coverage
 discover
 mox
 mock>=0.8.0
-pep8==1.3.3
 setuptools-git>=0.4
 sphinx>=1.1.2
 testrepository>=0.0.13
diff --git a/tox.ini b/tox.ini
index 17bb1720..e4d9772f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps = -r{toxinidir}/tools/pip-requires
 commands = python setup.py testr --testr-args='{posargs}'
 
 [testenv:pep8]
-commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,*egg .
+commands = flake8
 
 [testenv:venv]
 commands = {posargs}
@@ -24,3 +24,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
+
+[flake8]
+ignore = F,H
+show-source = True
+exclude = .venv,.tox,dist,doc,*egg