diff --git a/requirements.txt b/requirements.txt
index 35084ef608..8b241e0db8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,20 @@
 # 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.11,<2.0
+pbr<2.0,>=0.11
 six>=1.9.0
 
 Babel>=1.3
-cliff>=1.10.0  # Apache-2.0
+cliff>=1.10.0 # Apache-2.0
 cliff-tablib>=1.0
 os-client-config>=1.2.0
-oslo.config>=1.11.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 python-glanceclient>=0.18.0
 python-keystoneclient>=1.6.0
 python-novaclient>=2.22.0
 python-cinderclient>=1.2.2
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
 requests>=2.5.2
-stevedore>=1.5.0  # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
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 f82e48d74b..ce3fcd73aa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,17 +1,17 @@
 # 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.
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
 coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-oslosphinx>=2.5.0  # Apache-2.0
-oslotest>=1.5.1  # Apache-2.0
-requests-mock>=0.6.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 os-testr>=0.1.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 WebOb>=1.2.3