diff --git a/requirements.txt b/requirements.txt
index 88e449f8ba..c638ed1875 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # 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<2.0,>=1.6
+pbr>=1.6
 six>=1.9.0
 
 Babel>=1.3
diff --git a/setup.py b/setup.py
index d8080d05c8..782bb21f06 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.3'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 23edc37250..25d062898c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,4 +15,4 @@ os-testr>=0.1.0
 testrepository>=0.0.18
 testtools>=1.4.0
 WebOb>=1.2.3
-tempest-lib>=0.6.1
+tempest-lib>=0.8.0