diff --git a/requirements.txt b/requirements.txt
index db86eea1..8991b20c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # 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
+pbr!=0.7,<1.0,>=0.6
 
-dib-utils  # Apache-2.0
+dib-utils # Apache-2.0
 diskimage-builder>=0.1.20
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 a8ced22d..b1227b4f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,4 +3,4 @@
 # process, which may cause wedges in the gate later.
 
 bashate>=0.2 # Apache-2.0
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0