diff --git a/test-requirements.txt b/test-requirements.txt
index b424fa8f8b..de3d4ede7f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,14 +1,12 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
+
+# Keep hacking first, it pulls in the right versions of flake8, mccabe and pyflakes
+hacking<0.11,>=0.10.0
 bashate>=0.5.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
-flake8<2.6.0,>=2.5.4 # MIT
-hacking<0.11,>=0.10.0
-mccabe==0.2.1 # MIT License
 mock>=2.0.0 # BSD
-pep8==1.5.7 # MIT
-pyflakes==0.8.1 # MIT
 virtualenv>=13.1.0 # MIT
 
 # this is required for the docs build jobs