diff --git a/requirements.txt b/requirements.txt
index f67c03b..67df2df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,13 +2,13 @@
 # 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
 Babel>=1.3
 iso8601>=0.1.9
-oslo.config>=1.11.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
-posix_ipc
+oslo.config>=1.11.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+posix-ipc
 six>=1.9.0
-fasteners>=0.7  # Apache-2.0
-retrying>=1.2.3,!=1.3.0 # Apache-2.0
+fasteners>=0.7 # Apache-2.0
+retrying!=1.3.0,>=1.2.3 # Apache-2.0
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 5808fd5..4f6fe33 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,14 +2,14 @@
 # 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
-oslotest>=1.5.1  # Apache-2.0
+hacking<0.11,>=0.10.0
+oslotest>=1.5.1 # Apache-2.0
 coverage>=3.6
 futures>=3.0
 fixtures>=0.3.14
 
 # These are needed for docs generation
-oslosphinx>=2.5.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx>=2.5.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 
 eventlet>=0.17.3