diff --git a/.gitignore b/.gitignore
index 890183617d..bd904efc9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /MANIFEST
 /wagtail.egg-info/
 /docs/_build/
+/.tox/
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000..bb778f7408
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+envlist =
+    py27-dj16-postgres
+
+[testenv]
+commands=./runtests.py
+
+[testenv:py27-dj16-postgres]
+basepython=python2.7
+deps =
+    Django>=1.6,<1.7
+    psycopg2==2.5.2