diff --git a/requirements.txt b/requirements.txt
index 4d739e87c..e0ecbc81f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,27 +6,27 @@ Babel>=1.3
 cryptography>=0.8.2 # Apache-2.0
 eventlet>=0.17.3
 iso8601>=0.1.9
-jsonschema>=2.0.0,<3.0.0,!=2.5.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
 kombu>=3.0.7
 netaddr>=0.7.12
-oslo.concurrency>=2.0.0         # Apache-2.0
-oslo.config>=1.11.0  # Apache-2.0
-oslo.context>=0.2.0                     # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.messaging>=1.8.0  # Apache-2.0
-oslo.log>=1.2.0  # Apache-2.0
-oslo.policy>=0.5.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
+oslo.concurrency>=2.0.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.context>=0.2.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.messaging>=1.8.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
+oslo.policy>=0.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=1.6.0 # Apache-2.0
 Paste
 PasteDeploy>=1.5.0
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 pecan>=0.8.0
 pycrypto>=2.6
 pyOpenSSL>=0.11
 python-ldap>=2.4
 keystonemiddleware>=1.5.0
 six>=1.9.0
-SQLAlchemy>=0.9.7,<1.1.0
-stevedore>=1.5.0  # Apache-2.0
+SQLAlchemy<1.1.0,>=0.9.7
+stevedore>=1.5.0 # Apache-2.0
 WebOb>=1.2.3
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 193d99be2..03de09ffa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,17 +3,17 @@
 # process, which may cause wedges in the gate later.
 coverage>=3.6
 discover
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 mock>=1.0
-oslotest>=1.5.1  # Apache-2.0
-pykmip>=0.3.1  # Apache 2.0 License
+oslotest>=1.5.1 # Apache-2.0
+pykmip>=0.3.1 # Apache 2.0 License
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 fixtures>=0.3.14
 requests>=2.5.2
 python-keystoneclient>=1.6.0
 tempest-lib>=0.5.0
 
 # Documentation build requirements
-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
+oslosphinx>=2.5.0 # Apache-2.0