diff --git a/requirements.txt b/requirements.txt
index 55f2d8c1aa..30b209a90e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,39 +3,39 @@
 # process, which may cause wedges in the gate later.
 
 # pbr should be first
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 
 alembic>=0.7.2
 Babel>=1.3
-eventlet>=0.17.3
+eventlet>=0.17.4
 greenlet>=0.3.2
 httplib2>=0.7.5
 iso8601>=0.1.9
 lxml>=2.3
 netaddr>=0.7.12
-oslo.config>=1.11.0  # Apache-2.0
-oslo.context>=0.2.0                     # Apache-2.0
-oslo.db>=1.10.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.log>=1.2.0  # Apache-2.0
-oslo.messaging>=1.8.0  # Apache-2.0
-oslo.middleware>=1.2.0,!=2.0.0                  # Apache-2.0
-oslo.policy>=0.5.0  # Apache-2.0
-oslo.rootwrap>=2.0.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
-oslo.concurrency>=2.0.0         # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.context>=0.2.0 # Apache-2.0
+oslo.db>=1.10.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
+oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
+oslo.policy>=0.5.0 # Apache-2.0
+oslo.rootwrap>=2.0.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+oslo.concurrency>=2.0.0 # Apache-2.0
 paramiko>=1.13.0
 Paste
 PasteDeploy>=1.5.0
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
 keystonemiddleware>=1.5.0
 requests>=2.5.2
-retrying>=1.2.3,!=1.3.0 # Apache-2.0
-Routes>=1.12.3,!=2.0
+retrying!=1.3.0,>=1.2.3 # Apache-2.0
+Routes!=2.0,>=1.12.3
 six>=1.9.0
-SQLAlchemy>=0.9.7,<1.1.0
-stevedore>=1.5.0  # Apache-2.0
+SQLAlchemy<1.1.0,>=0.9.7
+stevedore>=1.5.0 # Apache-2.0
 python-cinderclient>=1.2.2
 python-novaclient>=2.22.0
 WebOb>=1.2.3
diff --git a/setup.py b/setup.py
index 736375744d..056c16c2b8 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 639f2f0841..ab62a080a2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # hacking should be first
-hacking>=0.9.2,<0.10
+hacking<0.10,>=0.9.2
 
 bashate>=0.2 # Apache-2.0
 coverage>=3.6
@@ -11,12 +11,12 @@ ddt>=0.7.0
 discover
 fixtures>=0.3.14
 mock>=1.0
-PyMySQL>=0.6.2  # MIT License
-oslotest>=1.5.1  # Apache-2.0
-oslosphinx>=2.5.0  # Apache-2.0
+PyMySQL>=0.6.2 # MIT License
+oslotest>=1.5.1 # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
 psycopg2
 python-subunit>=0.0.18
-requests-mock>=0.6.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0