diff --git a/requirements.txt b/requirements.txt
index fc668c4fb..fa300b9c4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 # 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
 argparse
-PrettyTable>=0.7,<0.8
+PrettyTable<0.8,>=0.7
 python-keystoneclient>=1.6.0
 requests>=2.5.2
 simplejson>=2.2.0
diff --git a/setup.py b/setup.py
index 736375744..056c16c2b 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 016e0e52e..1201cb485 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,15 +2,15 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
-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
+oslosphinx>=2.5.0 # Apache-2.0
 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
 tempest-lib>=0.5.0
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 testrepository>=0.0.18