diff --git a/requirements.txt b/requirements.txt
index 30070c0c..b7537f02 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,4 @@
 # 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
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 8ea5125f..a69d89e6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,16 +2,16 @@
 # 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
 mock>=1.0
-oslo.config>=1.11.0  # Apache-2.0
-pylint==1.4.1  # GNU GPL v2
+oslo.config>=1.11.0 # Apache-2.0
+pylint==1.4.1 # GNU GPL v2
 python-keystoneclient>=1.6.0
 python-swiftclient>=2.2.0
 selenium
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 unittest2