1 files changed, 6 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index f0b8128..33e33d7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,10 +15,7 @@ sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-deps=
-  pep8==1.3.3
-  pyflakes
-commands = bash tools/run_pep8.sh
+commands = flake8
 
 [testenv:pylint]
 setenv = VIRTUAL_ENV={envdir}
@@ -26,10 +23,6 @@ deps = -r{toxinidir}/tools/pip-requires
        pylint==0.26.0
 commands = bash tools/lintstack.sh
 
-[testenv:pyflakes]
-deps = pyflakes
-commands = python tools/flakes.py heat_cfntools
-
 [testenv:cover]
 # Also do not run test_coverage_ext tests while gathering coverage as those
 # tests conflict with coverage.
@@ -39,3 +32,8 @@ commands =
 
 [testenv:venv]
 commands = {posargs}
+
+[flake8]
+show-source = true
+builtins = _
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools