diff --git a/requirements.txt b/requirements.txt
index 8603836de..e34306e78 100644
--- a/requirements.txt
+++ b/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.
 Babel>=1.3
-cliff>=1.10.0  # Apache-2.0
-eventlet>=0.17.3
-Flask>=0.10,<1.0
+cliff>=1.13.0 # Apache-2.0
+eventlet>=0.17.4
+Flask<1.0,>=0.10
 keystonemiddleware>=1.5.0
 netifaces>=0.10.4
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 python-ironicclient>=0.2.1
 python-keystoneclient>=1.6.0
 python-openstackclient>=1.0.3
 requests>=2.5.2
-oslo.config>=1.11.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 six>=1.9.0
-stevedore>=1.5.0  # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
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 9381855a5..015c572a7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 coverage>=3.6
-doc8  # Apache-2.0
-hacking>=0.10.0,<0.11
+doc8 # Apache-2.0
+hacking<0.11,>=0.10.0
 mock>=1.0