diff --git a/tox.ini b/tox.ini
index ef07a1a48..1134f9db2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,13 +23,10 @@ deps=
     discover
     argparse
 
-[pep8]
-ignore = E125
-
 [testenv:pep8]
-deps = pep8
-commands = 
-    pep8 --repeat --show-source --exclude=.venv,.tox,doc .
+deps = hacking>=0.5.3,<0.6
+commands =
+  flake8 {posargs}
 
 [testenv:venv]
 commands = {posargs}
@@ -41,3 +38,9 @@ commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
+
+[flake8]
+ignore = E125,F,H
+builtins = _
+exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+