diff --git a/.gitignore b/.gitignore
index f40514dc8..010959083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ node_modules
 bower_components
 *.map
 sslkeylogfile.log
+.tox/
diff --git a/.python-version b/.python-version
new file mode 100644
index 000000000..2339c8bf3
--- /dev/null
+++ b/.python-version
@@ -0,0 +1,2 @@
+2.7.11
+3.5.1
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..9984eb1b1
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,10 @@
+[tox]
+envlist = py27, py35, lint
+
+[testenv]
+deps = -rrequirements.txt
+commands = py.test -n 8 --timeout 60 ./test/netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py
+
+[testenv:lint]
+deps = flake8
+commands = flake8 --exit-zero --count mitmproxy netlib pathod examples test