diff --git a/requirements.txt b/requirements.txt
index 842d3c3f8..dae379235 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,31 +2,31 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'
-jsonpatch>=1.1
-keystoneauth1>=2.1.0
-keystonemiddleware>=4.0.0,!=4.1.0
-oslo.config>=3.4.0  # Apache-2.0
-oslo.db>=4.1.0      # Apache-2.0
-oslo.i18n>=2.1.0    # Apache-2.0
-oslo.log>=1.14.0    # Apache-2.0
+enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
+jsonpatch>=1.1 # BSD
+keystoneauth1>=2.1.0 # Apache-2.0
+keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
+oslo.config>=3.4.0 # Apache-2.0
+oslo.db>=4.1.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.log>=1.14.0 # Apache-2.0
 oslo.messaging>=4.0.0 # Apache-2.0
-oslo.policy>=0.5.0  # Apache-2.0
+oslo.policy>=0.5.0 # Apache-2.0
 oslo.service>=1.0.0 # Apache-2.0
-oslo.utils>=3.4.0   # Apache-2.0
-PasteDeploy>=1.5.0
-pbr>=1.6
-pecan>=1.0.0
+oslo.utils>=3.5.0 # Apache-2.0
+PasteDeploy>=1.5.0 # MIT
+pbr>=1.6 # Apache-2.0
+pecan>=1.0.0 # BSD
 voluptuous>=0.8.6 # BSD License
-python-ceilometerclient>=2.2.1
-python-cinderclient>=1.3.1
-python-glanceclient>=1.2.0
-python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0
-python-neutronclient>=2.6.0
-python-novaclient>=2.29.0,!=2.33.0
-python-openstackclient>=2.0.0
-six>=1.9.0
-SQLAlchemy>=1.0.10,<1.1.0
-stevedore>=1.5.0    # Apache-2.0
-taskflow>=1.25.0 # Apache-2.0
-WSME>=0.8
+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-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-openstackclient>=2.1.0 # Apache-2.0
+six>=1.9.0 # MIT
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+stevedore>=1.5.0 # Apache-2.0
+taskflow>=1.26.0 # Apache-2.0
+WSME>=0.8 # MIT
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index 736375744..782bb21f0
--- 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 3460fb4a7..38a1bd0e4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,19 +2,19 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-coverage>=3.6
-discover
+coverage>=3.6 # Apache-2.0
+discover # BSD
 doc8 # Apache-2.0
-hacking>=0.10.2,<0.11
-mock>=1.2
-oslotest>=1.10.0  # Apache-2.0
-os-testr>=0.4.1
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+hacking<0.11,>=0.10.2
+mock>=1.2 # BSD
+oslotest>=1.10.0 # Apache-2.0
+os-testr>=0.4.1 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 
 # Doc requirements
-oslosphinx>=2.5.0,!=3.4.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-sphinxcontrib-pecanwsme>=0.8
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+sphinxcontrib-pecanwsme>=0.8 # Apache-2.0