diff --git a/test-requirements.txt b/test-requirements.txt
index ba97140..5da13ee 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,9 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 bashate>=0.2 # Apache-2.0
-flake8<2.6.0,>=2.5.4 # MIT
+flake8>=2.5.4,<2.6.0  # MIT
+flake8_docstrings==0.2.1.post1  # MIT
+flake8-import-order==0.11 # LGPLv3
 mock>=2.0  # BSD
 
 # this is required for the docs build jobs
diff --git a/tox.ini b/tox.ini
index 4431a5e..2034a40 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,7 +55,6 @@ commands =
 deps =
     flake8
     flake8-import-order
-    flake8-docstrings
     pep8-naming
 commands =
     flake8 .
@@ -65,7 +64,6 @@ basepython = python3.3
 deps =
     flake8
     flake8-import-order
-    flake8-docstrings
     pep8-naming
 commands =
     flake8 .