diff --git a/requirements.txt b/requirements.txt
index 9301690..6ccd284 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,10 +2,10 @@
 # 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
-python-keystoneclient!=1.8.0,>=1.6.0
+pbr>=1.6 # Apache-2.0
+Babel>=1.3 # BSD
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
 stevedore>=1.5.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
-oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils!=2.6.0,>=2.0.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0
+oslo.utils>=3.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f0d4068..e238ba0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,12 +4,12 @@
 
 hacking<0.10,>=0.9.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