diff --git a/requirements.txt b/requirements.txt
index d565a6cd..2acb49d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,31 +1,34 @@
-Babel>=2.3.4  # BSD
-boto>=2.32.1  # MIT
+# 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.
+Babel>=2.3.4 # BSD
+boto>=2.32.1 # MIT
 botocore>=1.0.0 # Apache-2.0
-eventlet!=0.18.3,>=0.18.2  # MIT
-greenlet>=0.3.2  # MIT
-httplib2>=0.7.5  # MIT
-lxml>=2.3  # BSD
-oslo.config>=3.14.0  # Apache-2.0
-oslo.concurrency>=3.8.0         # Apache-2.0
-oslo.context>=2.4.0             # Apache-2.0
-oslo.db>=4.1.0  # Apache-2.0
-oslo.log>=1.14.0  # Apache-2.0
+eventlet!=0.18.3,>=0.18.2 # MIT
+greenlet>=0.3.2 # MIT
+httplib2>=0.7.5 # MIT
+lxml>=2.3 # BSD
+oslo.config>=3.14.0 # Apache-2.0
+oslo.concurrency>=3.8.0 # Apache-2.0
+oslo.context>=2.6.0 # Apache-2.0
+oslo.db>=4.10.0 # Apache-2.0
+oslo.log>=1.14.0 # Apache-2.0
 oslo.messaging>=5.2.0 # Apache-2.0
-oslo.serialization>=1.10.0              # Apache-2.0
-oslo.service>=1.10.0                     # Apache-2.0
-oslo.utils>=3.16.0                       # Apache-2.0
-Paste  # MIT
-PasteDeploy>=1.5.0  # MIT
-pbr>=1.6  # Apache-2.0
-python-cinderclient>=1.6.0,!=1.7.0,!=1.7.1  # Apache-2.0
-python-glanceclient>=2.0.0  # Apache-2.0
-python-keystoneclient>=1.7.0,!=1.8.0,!=2.1.0  # Apache-2.0
-python-neutronclient>=4.2.0  # Apache-2.0
-python-novaclient>=2.29.0,!=2.33.0  # Apache-2.0
-python-openstackclient>=2.1.0  # Apache-2.0
-Routes>=1.12.3,!=2.0,!=2.1,!=2.3.0;python_version=='2.7'  # MIT
-Routes>=1.12.3,!=2.0,!=2.3.0;python_version!='2.7'  # MIT
-six>=1.9.0  # MIT
-SQLAlchemy>=1.0.10,<1.1.0  # MIT
-sqlalchemy-migrate>=0.9.6  # Apache-2.0
-WebOb>=1.2.3  # MIT
+oslo.serialization>=1.10.0 # Apache-2.0
+oslo.service>=1.10.0 # Apache-2.0
+oslo.utils>=3.16.0 # Apache-2.0
+Paste # MIT
+PasteDeploy>=1.5.0 # MIT
+pbr>=1.6 # Apache-2.0
+python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
+python-glanceclient>=2.0.0 # Apache-2.0
+python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0
+python-neutronclient>=4.2.0 # Apache-2.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+python-openstackclient>=2.1.0 # Apache-2.0
+Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3;python_version=='2.7' # MIT
+Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT
+six>=1.9.0 # MIT
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+sqlalchemy-migrate>=0.9.6 # Apache-2.0
+WebOb>=1.2.3 # MIT
diff --git a/setup.py b/setup.py
index 73637574..782bb21f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,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 470b6b75..4cc0f1d0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,14 @@
-coverage>=3.6  # Apache-2.0
-fixtures>=3.0.0  # Apache-2.0/BSD
-hacking>=0.11.0,<0.12  # Apache-2.0
-mock>=2.0  # BSD
-nose  # LGPL
-oslotest>=1.10.0  # Apache-2.0
-pylint==1.4.5  # GPLv2
-python-subunit>=0.0.18  # Apache-2.0/BSD
-sphinx>=1.2.1,!=1.3b1,<1.3  # BSD
-testrepository>=0.0.18  # Apache-2.0/BSD
-testtools>=1.4.0  # MIT
+# 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.
+coverage>=3.6 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
+hacking<0.12,>=0.11.0 # Apache-2.0
+mock>=2.0 # BSD
+nose # LGPL
+oslotest>=1.10.0 # Apache-2.0
+pylint==1.4.5 # GPLv2
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT