diff --git a/requirements.txt b/requirements.txt
index 64a25d85..be64e667 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,35 +2,35 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6
-Babel>=1.3
-eventlet>=0.17.4
-greenlet>=0.3.2
-keystonemiddleware>=4.0.0
-oslo.config>=2.7.0 # Apache-2.0
-oslo.concurrency>=2.3.0 # Apache-2.0
-oslo.context>=0.2.0 # Apache-2.0
-oslo.db>=3.2.0 # Apache-2.0
-oslo.log>=1.12.0 # Apache-2.0
-oslo.messaging>2.6.1,!=2.8.0 # Apache-2.0
+pbr>=1.6 # Apache-2.0
+Babel>=1.3 # BSD
+eventlet!=0.18.3,>=0.18.2 # MIT
+greenlet>=0.3.2 # MIT
+keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
+oslo.config>=3.9.0 # Apache-2.0
+oslo.concurrency>=3.5.0 # Apache-2.0
+oslo.context>=2.2.0 # Apache-2.0
+oslo.db>=4.1.0 # Apache-2.0
+oslo.log>=1.14.0 # Apache-2.0
+oslo.messaging>=4.5.0 # Apache-2.0
 oslo.middleware>=3.0.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.service>=1.0.0 # Apache-2.0
-oslo.versionedobjects>=1.4.0 # Apache-2.0
-Paste
-PasteDeploy>=1.5.0
+oslo.versionedobjects>=1.5.0 # Apache-2.0
+Paste # MIT
+PasteDeploy>=1.5.0 # MIT
 python-glanceclient>=2.0.0 # Apache-2.0
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
-python-cinderclient>=1.3.1 # Apache-2.0
-requests>=2.8.1
-Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
-Routes!=2.0,>=1.12.3;python_version!='2.7'
-python-neutronclient>=2.6.0,!=4.1.0  # Apache-2.0
-six>=1.9.0
-SQLAlchemy<1.1.0,>=0.9.9
-sqlalchemy-migrate>=0.9.6
+python-cinderclient>=1.6.0 # Apache-2.0
+requests!=2.9.0,>=2.8.1 # Apache-2.0
+Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' # MIT
+Routes!=2.0,>=1.12.3;python_version!='2.7' # MIT
+python-neutronclient>=4.1.1 # Apache-2.0
+six>=1.9.0 # MIT
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+sqlalchemy-migrate>=0.9.6 # Apache-2.0
 stevedore>=1.5.0 # Apache-2.0
-WebOb>=1.2.3
-oslo.i18n>=1.5.0 # Apache-2.0
+WebOb>=1.2.3 # MIT
+oslo.i18n>=2.1.0 # Apache-2.0
 python-swiftclient>=2.2.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 056c16c2..782bb21f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,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 78e691a9..c579b475 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,13 +4,13 @@
 
 hacking<0.11,>=0.10.2
 
-coverage>=3.6
-discover
-python-subunit>=0.0.18
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-oslosphinx>=2.5.0 # Apache-2.0
+coverage>=3.6 # Apache-2.0
+discover # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 python-swiftclient>=2.2.0 # Apache-2.0