diff --git a/test-requirements.txt b/test-requirements.txt
index 8f630cf..de04df0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,6 @@
 pep8==1.4.5
-pyflakes>=0.7.2,<0.7.4
-flake8==2.0
+pyflakes>=0.7.2,<0.8.1
+flake8<3.6.0
 docutils>=0.11  # OSI-Approved Open Source, Public Domain
 stestr>=1.1.0 # Apache-2.0
 testtools>=0.9.34
diff --git a/tox.ini b/tox.ini
index e191ce6..8fcb096 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,6 @@ whitelist_externals =
 distribute = false
 
 [testenv:pep8]
-deps = flake8
 commands = flake8
 distribute = false