diff --git a/requirements.txt b/requirements.txt
index b055f8366..42f96f332 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,16 @@
 # 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
 
 beautifulsoup4
 iso8601>=0.1.9
 six>=1.9.0
 PyYAML>=3.1.0
 
-oslo.log>=1.2.0  # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
 
 # not listed in global requirements
 django-floppyforms>=1.1
-yaql>=0.2.6,<0.3
+yaql>=0.2.6,<0.3 # Apache 2.0 License
 python-muranoclient>=0.5.6
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index 736375744..056c16c2b
--- 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 15d7fbbad..717ca9d32 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,24 +1,24 @@
 # 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.
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
 coverage>=3.6
 django-nose>=1.2
 nose
-oslo.config>=1.11.0  # Apache-2.0
-openstack.nose_plugin>=0.7
+oslo.config>=1.11.0 # Apache-2.0
+openstack.nose-plugin>=0.7
 nosehtmloutput>=0.0.3
 selenium
 
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 mock>=1.0
 mox>=0.5.3
 
 # Docs Requirements
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 
 # Horizon requirements
-Django>=1.4.2,<1.8
-django_compressor>=1.4
-django_openstack_auth>=1.1.7,!=1.1.8
+Django<1.8,>=1.4.2
+django-compressor>=1.4
+django-openstack-auth!=1.1.8,>=1.1.7