diff --git a/lower-constraints.txt b/lower-constraints.txt
index 5646ea2eb..adf5c2a42 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -13,12 +13,9 @@ eventlet==0.18.2
 extras==1.0.0
 fasteners==0.7.0
 fixtures==3.0.0
-flake8==2.6.2
-flake8-import-order==0.12
 future==0.16.0
 futurist==1.2.0
 greenlet==0.4.10
-hacking==1.1.0
 imagesize==0.7.1
 iso8601==0.1.11
 Jinja2==2.10
@@ -27,7 +24,6 @@ kombu==4.0.0
 linecache2==1.0.0
 Mako==0.4.0
 MarkupSafe==1.0
-mccabe==0.2.1
 monotonic==0.6
 mox3==0.20.0
 msgpack-python==0.4.0
@@ -57,12 +53,9 @@ Paste==2.0.2
 PasteDeploy==1.5.0
 pbr==2.0.0
 pecan===1.0.0
-pep8==1.5.7
 pika==0.10.0
 pika-pool==0.1.3
 prettytable==0.7.2
-pycodestyle==2.4.0
-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 1bdb04264..936effc2a 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,<2.1 # Apache-2.0
+hacking>=3.0.0,<3.1 # Apache-2.0
 
 bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0