diff --git a/requirements.txt b/requirements.txt
index 1fd5451c9..0cce44103 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ eventlet!=0.18.3,>=0.18.2 # MIT
 keystonemiddleware>=4.12.0 # Apache-2.0
 greenlet>=0.3.2 # MIT
 jsonpatch>=1.1 # BSD
-pbr>=1.8 # Apache-2.0
+pbr>=2.0.0 # Apache-2.0
 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
 python-etcd>=0.4.3 # MIT License
 python-glanceclient>=2.5.0 # Apache-2.0
@@ -29,5 +29,5 @@ os-vif>=1.4.0 # Apache-2.0
 six>=1.9.0 # MIT
 WSME>=0.8 # MIT
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
-stevedore>=1.17.1 # Apache-2.0
+stevedore>=1.20.0 # Apache-2.0
 docker-py>=1.8.1 # Apache-2.0
diff --git a/setup.py b/setup.py
index 782bb21f0..566d84432 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.8'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 6411c24c8..64d3b8d10 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ doc8 # Apache-2.0
 coverage>=4.0 # Apache-2.0
 mock>=2.0 # BSD
 fixtures>=3.0.0 # Apache-2.0/BSD
-hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 sphinx>=1.5.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0