diff --git a/requirements.txt b/requirements.txt
index b7eed5c..0264ee2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 # 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.
-kombu>=3.0.25,<4.0.0  # BSD
+kombu<4.0.0,>=3.0.25 # BSD
+
diff --git a/setup.py b/setup.py
index 7363757..782bb21 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");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 197ca10..49c8dd5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,19 +2,19 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=0.8.0,<0.9
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
-nose
-mock>=1.0
-mox>=0.5.3
-sphinx>=1.1.2,!=1.2.0,<1.3
-sphinxcontrib-httpdomain
+nose # LGPL
+mock>=2.0 # BSD
+mox>=0.5.3 # Apache-2.0
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+sphinxcontrib-httpdomain # BSD
 
-discover
-fixtures>=0.3.14
-testrepository>=0.0.18
-testtools>=0.9.34
-coverage>=3.6
+discover # BSD
+fixtures>=3.0.0 # Apache-2.0/BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+coverage>=4.0 # Apache-2.0
 
 http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
 oslotest>=1.10.0 # Apache-2.0