diff --git a/setup.py b/setup.py
index b05a57a0..8cdbad91 100755
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,7 @@ from setuptools.command.install import install
 import os.path
 import sys
 
+version = None
 # version comes from git-review.
 savename = __name__
 __name__ = "not-main"
diff --git a/tox.ini b/tox.ini
index 2d17b070..d1ec544c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,9 +5,15 @@ envlist = py26,py27,pep8
 setenv = VIRTUAL_ENV={envdir}
 
 [testenv:pep8]
-deps = pep8==1.3.1
+deps = flake8
        argparse
-commands = pep8 --ignore=E125 --repeat --show-source setup.py git-review
+commands = flake8
 
 [testenv:sdist]
 commands = python setup.py sdist {posargs}
+
+[flake8]
+ignore = E125
+show-source = True
+exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+filename = git-review,setup.py