diff --git a/tools/test-requires b/tools/test-requires
index aa85c1bf8b..f7e962b25e 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -10,7 +10,7 @@ nose
 nosehtmloutput
 nosexcover
 openstack.nose_plugin
-pep8
+pep8==1.3.3
 python-subunit
 sphinx>=1.1.2
 testrepository>=0.0.13
diff --git a/tox.ini b/tox.ini
index 3b4fadeafd..20a7f545f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,12 +19,12 @@ sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-# E712 comparison to False should be 'if cond is False:' or 'if not cond:'
+# E711/E712 comparison to False should be 'if cond is False:' or 'if not cond:'
 #        query = query.filter(Component.disabled == False)
 # E125 continuation line does not distinguish itself from next logical line
 
 commands =
-  pep8 --repeat --show-source --ignore=E125,E712 --exclude=.venv,.tox,dist,doc,openstack,*egg .
+  pep8 --repeat --show-source --ignore=E125,E711,E712 --exclude=.venv,.tox,dist,doc,openstack,*egg .
   pep8 --repeat --show-source --ignore=E125 --filename=quantum* bin
 
 [testenv:i18n]