diff --git a/requirements.txt b/requirements.txt
index 614ca29643..6d22b2969d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,36 +7,36 @@
 # be installed in a specific order.
 #
 # PBR should always appear first
-pbr>=1.6
+pbr>=1.6 # Apache-2.0
 # Horizon Core Requirements
-Babel>=1.3
-Django<1.9,>=1.8
+Babel>=1.3 # BSD
+Django<1.9,>=1.8 # BSD
 Pint>=0.5 # BSD
-django-babel>=0.4.0
-django-compressor>=1.4
-django-openstack-auth>=2.0.0
+django-babel>=0.4.0 # BSD
+django-compressor>=1.4 # MIT
+django-openstack-auth>=2.0.0 # Apache-2.0
 django-pyscss>=2.0.2 # BSD License (2 clause)
-httplib2>=0.7.5
-iso8601>=0.1.9
-netaddr!=0.7.16,>=0.7.12
+httplib2>=0.7.5 # MIT
+iso8601>=0.1.9 # MIT
+netaddr!=0.7.16,>=0.7.12 # BSD
 oslo.concurrency>=2.3.0 # Apache-2.0
 oslo.config>=3.2.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
+oslo.utils>=3.4.0 # Apache-2.0
 pyScss>=1.3.4 # MIT License
-python-ceilometerclient>=2.0.0
-python-cinderclient>=1.3.1
-python-glanceclient>=1.2.0
-python-heatclient>=0.6.0
-python-keystoneclient!=1.8.0,>=1.6.0
-python-neutronclient>=2.6.0
-python-novaclient!=2.33.0,>=2.29.0
-python-swiftclient>=2.2.0
-pytz>=2013.6
-PyYAML>=3.1.0
-six>=1.9.0
+python-ceilometerclient>=2.2.1 # Apache-2.0
+python-cinderclient>=1.3.1 # Apache-2.0
+python-glanceclient>=1.2.0 # Apache-2.0
+python-heatclient>=0.6.0 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+python-neutronclient>=2.6.0 # Apache-2.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+python-swiftclient>=2.2.0 # Apache-2.0
+pytz>=2013.6 # MIT
+PyYAML>=3.1.0 # MIT
+six>=1.9.0 # MIT
 XStatic>=1.0.0 # MIT License
 XStatic-Angular>=1.3.7 # MIT License
 XStatic-Angular-Bootstrap>=0.11.0.2 # MIT License
diff --git a/test-requirements.txt b/test-requirements.txt
index 8d6d57e5c9..326c9d2bc7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,20 +9,20 @@
 # Hacking should appear first in case something else depends on pep8
 hacking<0.11,>=0.10.0
 #
-coverage>=3.6
-django-nose>=1.2
-mock>=1.2
-mox3>=0.7.0
-nodeenv>=0.9.4 # BSD License
-nose
-nose-exclude
-nosehtmloutput>=0.0.3
-nosexcover
-openstack.nose-plugin>=0.7
+coverage>=3.6 # Apache-2.0
+django-nose>=1.2 # BSD
+mock>=1.2 # BSD
+mox3>=0.7.0 # Apache-2.0
+nodeenv>=0.9.4 # BSD License  # BSD
+nose # LGPL
+nose-exclude # LGPL
+nosehtmloutput>=0.0.3 # Apache-2.0
+nosexcover # BSD
+openstack.nose-plugin>=0.7 # Apache-2.0
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 reno>=0.1.1 # Apache2
-selenium
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testtools>=1.4.0
+selenium # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+testtools>=1.4.0 # MIT
 # This also needs xvfb library installed on your OS
 xvfbwrapper>=0.1.3 #license: MIT