diff --git a/requirements.txt b/requirements.txt
index 9b22978c..b39a598f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,12 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6
-netaddr>=0.7.12,!=0.7.16
-oslo.config>=3.4.0 # Apache-2.0
-oslo.log>=1.14.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.privsep>=1.3.0  # Apache-2.0
-oslo.versionedobjects>=0.13.0
-six>=1.9.0
-stevedore>=1.5.0  # Apache-2.0
+pbr>=1.6 # Apache-2.0
+netaddr!=0.7.16,>=0.7.12 # BSD
+oslo.config>=3.9.0 # Apache-2.0
+oslo.log>=1.14.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.privsep>=1.5.0 # Apache-2.0
+oslo.versionedobjects!=1.9.0,>=1.5.0 # Apache-2.0
+six>=1.9.0 # MIT
+stevedore>=1.10.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 73637574..782bb21f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,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 3f5d210b..74181c1c 100644
--- a/test-requirements.txt
+++ b/test-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.
 
-hacking>=0.10.2,<0.11
-coverage>=3.6
-discover
-python-subunit>=0.0.18
+hacking<0.11,>=0.10.2
+coverage>=3.6 # Apache-2.0
+discover # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
 reno>=1.6.2 # Apache2
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0,!=3.4.0  # Apache-2.0
-oslotest>=1.10.0  # Apache-2.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+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 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT