diff --git a/.gitignore b/.gitignore
index 852d1f56..fd21cca7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ local_settings.py
 \.#*
 *#*#
 .ve2
+ve2
+.tox
diff --git a/tox.ini b/tox.ini
index 721801fa..702fc5f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,16 @@
+[tox]
+minversion = 1.6
+skipsdist = True
+envlist = pep8
+
+[testenv]
+basepython = python2.7
+skip_install = True
+install_command = pip install {opts} {packages}
+deps = flake8
+commands = flake8 {posargs}
+
 [flake8]
-ignore = E265,E501
 max-line-length = 100
 max-complexity = 10
+exclude = .venv,.tox,ve2,.ve2,cms_pages,pinaxcon/proposals/migrations,pinaxcon/registrasion/migrations