diff --git a/requirements.txt b/requirements.txt
index bf9bb67e..134a7891 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,31 +1,31 @@
-Babel>=1.3
-boto>=2.32.1
-botocore>=1.0.0  # Apache-2.0
-eventlet>=0.17.4
-greenlet>=0.3.2
-httplib2>=0.7.5
-lxml>=2.3
-oslo.config>=2.6.0  # Apache-2.0
-oslo.concurrency>=2.3.0         # Apache-2.0
+Babel>=1.3  # 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.7.0  # Apache-2.0
+oslo.concurrency>=3.5.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
+oslo.db>=4.1.0  # Apache-2.0
+oslo.log>=1.14.0  # Apache-2.0
+oslo.messaging>=4.0.0 # Apache-2.0
 oslo.serialization>=1.10.0              # Apache-2.0
 oslo.service>=1.0.0                     # Apache-2.0
-oslo.utils>=2.8.0                       # Apache-2.0
-Paste
-PasteDeploy>=1.5.0
-pbr>=1.6
-python-cinderclient>=1.3.1
-python-glanceclient>=0.18.0
-python-keystoneclient>=1.6.0,!=1.8.0
-python-neutronclient>=2.6.0
-python-novaclient>=2.29.0,!=2.33.0
-python-openstackclient>=1.5.0
-Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7'
-Routes>=1.12.3,!=2.0;python_version!='2.7'
-six>=1.9.0
-SQLAlchemy>=0.9.9,<1.1.0
-sqlalchemy-migrate>=0.9.6
-WebOb>=1.2.3
+oslo.utils>=3.5.0                       # Apache-2.0
+Paste  # MIT
+PasteDeploy>=1.5.0  # MIT
+pbr>=1.6  # Apache-2.0
+python-cinderclient>=1.3.1  # Apache-2.0
+python-glanceclient>=2.0.0  # Apache-2.0
+python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0  # Apache-2.0
+python-neutronclient>=2.6.0,!=4.1.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;python_version=='2.7'  # MIT
+Routes>=1.12.3,!=2.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
diff --git a/test-requirements.txt b/test-requirements.txt
index 0b86d6ed..9de7e62d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,11 @@
-coverage>=3.6
-fixtures>=1.3.1
-hacking>=0.10.2,<0.11
-mock>=1.2
-nose
+coverage>=3.6  # Apache-2.0
+fixtures>=1.3.1,<2.0  # Apache-2.0/BSD
+hacking>=0.10.2,<0.11  # Apache-2.0
+mock>=1.2  # BSD
+nose  # LGPL
 oslotest>=1.10.0  # Apache-2.0
-pylint==1.4.4  # GNU GPL v2
-python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-testrepository>=0.0.18
-testtools>=1.4.0
+pylint==1.4.5  # GNU GPL v2
+python-subunit>=0.0.18  # Apache-2.0/BSD
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3  # BSD
+testrepository>=0.0.18  # Apache-2.0/BSD
+testtools>=1.4.0  # MIT