diff --git a/requirements.txt b/requirements.txt
index 5db8acb4..a7bd63c8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
 # 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.6,!=0.7,<1.0
-requests>=1.2.1,!=2.4.0
-six>=1.7.0
-stevedore>=1.0.0  # Apache-2.0
-jsonschema>=2.0.0,<3.0.0
+pbr!=0.7,<1.0,>=0.6
+requests!=2.4.0,>=2.2.0
+six>=1.9.0
+stevedore<1.4.0,>=1.3.0 # Apache-2.0
+jsonschema<3.0.0,>=2.0.0
 
-python-keystoneclient>=0.10.0
+python-keystoneclient<1.4.0,>=1.2.0
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 222159e8..461973cb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,18 +2,18 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
+hacking<0.9,>=0.8.0
 # Unit testing
 discover
-fixtures>=0.3.14
-mock>=1.0
+fixtures<1.3.0,>=0.3.14
+mock<1.1.0,>=1.0
 python-subunit>=0.0.18
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools!=1.2.0,>=0.9.36
 # Test runner
 nose
 nose-exclude
-openstack.nose_plugin>=0.7
+openstack.nose-plugin>=0.7
 # Metrics and style
 coverage>=3.6