diff --git a/tox.ini b/tox.ini
index 344f60ad81..b73d0ca17e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,9 @@ commands = nosetests {posargs}
 
 [testenv:pep8]
 deps = pep8==1.3.3
-commands = pep8 --exclude=vcsversion.py,*.pyc,openstack --repeat --show-source bin doc httpd keystone setup.py tests
+commands =
+  pep8 --exclude=.venv,.tox,dist,doc,openstack,vendor,*egg --repeat --show-source .
+  pep8 --repeat --show-source --filename=keystone* bin
 
 [tox:jenkins]
 downloadcache = ~/cache/pip