diff --git a/lower-constraints.txt b/lower-constraints.txt
index b803743cc..f7ec19632 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -15,10 +15,8 @@ eventlet==0.18.2
 extras==1.0.0
 fasteners==0.7.0
 fixtures==3.0.0
-flake8==2.5.5
 future==0.16.0
 greenlet==0.4.10
-hacking==2.0.0
 idna==2.6
 imagesize==0.7.1
 iso8601==0.1.11
@@ -52,10 +50,8 @@ oslotest==3.2.0
 Paste==2.0.2
 PasteDeploy==1.5.0
 pbr==2.0.0
-pep8==1.5.7
 prettytable==0.7.2
 pycparser==2.18
-pyflakes==0.8.1
 Pygments==2.2.0
 pyinotify==0.9.6
 pyparsing==2.1.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 81f1fcd69..1d8814973 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=2.0.0 # Apache-2.0
+hacking>=3.0.1,<3.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 reno>=2.5.0 # Apache-2.0