diff --git a/requirements.txt b/requirements.txt
index 427eb983..84764d7e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,3 @@
-# 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.
-
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 python-ironicclient!=2.5.2,!=2.7.1,>=2.3.0 # Apache-2.0
 horizon>=17.1.0  # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 9b9e5358..463090fe 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,4 @@
-# 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.
-
-hacking>=3.1.0,<4.0.0 # Apache-2.0
+hacking>=6.1.0,<6.2.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 nodeenv>=0.9.4 # BSD
@@ -10,7 +6,6 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-pycodestyle>=2.0.0,<2.7.0 # MIT
 
 # integration tests requirements
 selenium>=2.50.1 # Apache-2.0