diff --git a/requirements.txt b/requirements.txt
index b3853bf..9a02e0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,5 @@
 #
 # PBR should always appear first
 pbr>=1.6
+
+reno>=0.1.1  # Apache2
diff --git a/test-requirements.txt b/test-requirements.txt
index d17fac8..86ad13d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,8 +12,8 @@ hacking<0.11,>=0.10.0
 #
 coverage>=3.6
 django-nose>=1.2
-flake8
-mock
+flake8<=2.4.1,>=2.2.4
+mock>=1.2
 mox3>=0.7.0
 nodeenv>=0.9.4 # BSD License
 nose
@@ -21,7 +21,7 @@ nose-exclude
 nosehtmloutput>=0.0.3
 nosexcover
 openstack.nose-plugin>=0.7
-oslosphinx>=2.5.0 # Apache-2.0
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 selenium
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testtools>=1.4.0