diff --git a/requirements.txt b/requirements.txt
index 9f4b6d12..877299c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,14 +2,14 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr<2.0,>=1.3
-Babel>=1.3
-Flask>=0.10,<1.0
-jsonschema!=2.5.0,<3.0.0,>=2.0.0
-netaddr>=0.7.12
-oslo.concurrency>=2.3.0         # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=2.0.0                       # Apache-2.0
-python-neutronclient>=2.4.0,<3
-pyroute2>=0.3.10  # Apache-2.0 (+ dual licensed GPL2)
-os-client-config>=1.13.1
+pbr>=1.6 # Apache-2.0
+Babel>=1.3 # BSD
+Flask<1.0,>=0.10 # BSD
+jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
+netaddr!=0.7.16,>=0.7.12 # BSD
+oslo.concurrency>=2.3.0 # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0
+oslo.utils>=3.4.0 # Apache-2.0
+python-neutronclient>=2.6.0 # Apache-2.0
+pyroute2>=0.3.10 # Apache-2.0 (+ dual licensed GPL2)
+os-client-config>=1.13.1 # 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 45026877..e33f2066 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,14 +5,14 @@
 
 hacking<0.11,>=0.10.0
 
-coverage>=3.6
-ddt>=0.7.0
-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
+ddt>=1.0.1 # MIT
+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
-docker-py>=1.5.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+docker-py>=1.6.0 # Apache-2.0
 reno>=0.1.1 # Apache2