diff --git a/setup.py b/setup.py
index 056c16c..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -25,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 12fe1ce..2420e00 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,8 +3,8 @@
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
 
-flake8
-mock
+flake8<=2.4.1,>=2.2.4
+mock>=1.2
 nose
 coverage>=3.6
 #discover