diff --git a/requirements.txt b/requirements.txt
index 085fba7..c53f7e4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,15 @@
-astroid<1.4.0 # breaks pylint 1.4.4
-setuptools>=16.0
-pbr>=1.6
-python-keystoneclient>=1.6.0,!=1.8.0
+# 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.
+astroid<1.4.0 # LGPLv2.1 # breaks pylint 1.4.4
+setuptools!=24.0.0,>=16.0 # PSF/ZPL
+pbr>=1.6 # Apache-2.0
+python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0
 
-cliff!=1.16.0,>=1.15.0 # Apache-2.0
-oslo.utils>=3.2.0
-oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=1.14.0
-oslo.config>=3.2.0  # Apache-2.0
+cliff>=2.2.0 # Apache-2.0
+oslo.utils>=3.16.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.log>=3.11.0 # Apache-2.0
+oslo.config>=3.14.0 # Apache-2.0
 
 six>=1.9.0 # MIT
diff --git a/setup.py b/setup.py
index 47d3180..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# (c) Copyright 2014-2016 Hewlett-Packard Development Company, L.P.
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -8,7 +8,8 @@
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
@@ -24,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 7ec4067..2249d1d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,14 @@
-flake8>=2.2.4,<=2.4.1
-hacking>=0.10.2,<0.11
-coverage>=3.6
-mock>=1.2
-pylint==1.4.5 # GNU GPL v2
-python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD
-oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0
-testrepository>=0.0.18
-testtools>=1.4.0
-reno>=1.8.0  # Apache2
\ No newline at end of file
+# 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.
+flake8<2.6.0,>=2.5.4 # MIT
+hacking<0.11,>=0.10.2
+coverage>=3.6 # Apache-2.0
+mock>=2.0 # BSD
+pylint==1.4.5 # GPLv2
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+reno>=1.8.0 # Apache2