diff --git a/requirements.txt b/requirements.txt
index 87a6d7c..4ee4313 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,16 +3,16 @@
 # process, which may cause wedges in the gate later.
 
 # See: https://bugs.launchpad.net/pbr/+bug/1384919 for why this is here...
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 
 # Python 2->3 compatibility library.
 six>=1.9.0
 
 # For deprecation of things
-debtcollector>=0.3.0  # Apache-2.0
+debtcollector>=0.3.0 # Apache-2.0
 
 # Only needed on python 2.6
 ordereddict
 
 # For pretty formatting machines/state tables...
-PrettyTable>=0.7,<0.8
+PrettyTable<0.8,>=0.7
diff --git a/setup.py b/setup.py
index 7363757..056c16c 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 031650a..767cb3c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,9 +7,9 @@ hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 python-subunit>=0.0.18
-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
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0