diff --git a/.gitignore b/.gitignore
index a34f51213028d..18a2c36d11512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.pot
 *.py[co]
 docs/_build/
+.tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000000..8540df0a91c8f
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py26, py27
+
+[testenv]
+changedir = {toxinidir}/tests
+commands =
+    {envpython} runtests.py --settings=test_sqlite