diff --git a/requirements.txt b/requirements.txt
index 231d8fa1..e88ad6e4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,15 @@
 # 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.
-oslo.config>=1.11.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.4.0                       # Apache-2.0
-oslo.concurrency>=1.8.0         # Apache-2.0
-stevedore>=1.3.0  # Apache-2.0
-enum34
+oslo.config>=1.11.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+oslo.concurrency>=2.1.0 # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
+enum34;python_version=='2.7' or python_version=='2.6'
 
-eventlet>=0.17.3
+eventlet>=0.17.4
 six>=1.9.0
 
-jsonschema>=2.0.0,<3.0.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.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 6bfc954a..b3bc8d6d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,24 +2,24 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Metrics and style
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
 # Packaging
 mock>=1.0
 
 # Unit testing
 coverage>=3.6
-fixtures>=0.3.14
+fixtures>=1.3.1
 python-subunit>=0.0.18
-requests-mock>=0.6.0  # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
-oslotest>=1.5.1  # Apache-2.0
+testtools>=1.4.0
+oslotest>=1.5.1 # Apache-2.0
 
 # this is required for the docs build jobs
-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
 
 #
 # Store specific packages
@@ -29,14 +29,14 @@ oslosphinx>=2.5.0  # Apache-2.0
 boto>=2.32.1
 
 # For VMware storage backend.
-oslo.vmware>=0.11.1,!=0.13.0            # Apache-2.0
+oslo.vmware>=0.13.1 # Apache-2.0
 
 # Swift Backend
 httplib2>=0.7.5
 python-swiftclient>=2.2.0
 
 # GridFS backend
-pymongo>=2.6.3
+pymongo>=3.0.2
 
 # Cinder backend
-python-cinderclient>=1.2.1
+python-cinderclient>=1.2.2