diff --git a/requirements-py3.txt b/requirements-py3.txt
index 9c359b34..3e8ee794 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -1,15 +1,15 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
 Babel>=1.3
-stevedore>=1.1.0
+stevedore<1.4.0,>=1.3.0 # Apache-2.0
 six>=1.9.0
 iso8601>=0.1.9
 kazoo>=1.3.1
-pymemcache>=1.2
-zake>=0.1.6
+pymemcache>=1.2 # Apache 2.0 License
+zake>=0.1.6 # Apache-2.0
 msgpack-python>=0.4.0
-retrying>=1.2.3,!=1.3.0
-oslo.utils>=1.2.0                       # Apache-2.0
+retrying!=1.3.0,>=1.2.3 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
 redis>=2.10.0
diff --git a/requirements.txt b/requirements.txt
index 4f3931ca..67608b77 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,16 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
 Babel>=1.3
-stevedore>=1.1.0
+stevedore<1.4.0,>=1.3.0 # Apache-2.0
 six>=1.9.0
 iso8601>=0.1.9
 kazoo>=1.3.1
-pymemcache>=1.2
+pymemcache>=1.2 # Apache 2.0 License
 zake>=0.1.6 # Apache-2.0
 msgpack-python>=0.4.0
-retrying>=1.2.3,!=1.3.0
+retrying!=1.3.0,>=1.2.3 # Apache-2.0
 futures>=2.1.6
-oslo.utils>=1.2.0                       # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
 redis>=2.10.0
diff --git a/setup.py b/setup.py
index 73637574..056c16c2 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");
diff --git a/test-requirements.txt b/test-requirements.txt
index 6c62a755..29b379fa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,14 +5,14 @@ pep8==1.5.7
 pyflakes==0.8.1
 flake8==2.2.4
 discover
-mock>=1.0  # only needed on < python 3.3
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.2.0  # Apache-2.0
+mock<1.1.0,>=1.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools!=1.2.0,>=0.9.36
 testscenarios>=0.4
 coverage>=3.6
 psycopg2
-PyMySQL>=0.6.2
-sysv_ipc>=0.6.8
+PyMySQL>=0.6.2 # MIT License
+sysv-ipc>=0.6.8 # BSD License