diff --git a/requirements.txt b/requirements.txt
index 19651eea0..8091c2b90 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ pbr<2.0,>=0.11
 
 oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
-oslo.log>=1.2.0  # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
 oslo.utils>=1.6.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
 oslo.service>=0.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 66359ded5..229cd4d25 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,8 @@ hacking<0.11,>=0.10.0
 
 discover
 fixtures>=1.3.1
-mock>=1.0
+mock>=1.0;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
 mox3>=0.7.0
 python-subunit>=0.0.18
 testrepository>=0.0.18