diff --git a/requirements-test.txt b/requirements-test.txt
index e1ad307d..40df78d4 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,6 +1,6 @@
 -r requirements.txt
 
-flake8
+flake8<3.0
 pytest
 pytest-expect>=1.1,<2.0
 mock
diff --git a/tox.ini b/tox.ini
index efaea775..da64de71 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = {py26,py27,py33,py34,py35,pypy}-{base,optional}
 
 [testenv]
 deps =
-  flake8
+  flake8<3.0
   pytest
   pytest-expect>=1.1,<2.0
   mock