diff --git a/.gitignore b/.gitignore
index 4844be8e..5c012aaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ dist
 *.egg
 *.egg-info
 _mailinglist
+.tox
diff --git a/Makefile b/Makefile
index 8055e8ef..ab0a8d97 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ all: clean-pyc test
 test:
 	python setup.py test
 
+tox-test:
+	PYTHONDONTWRITEBYTECODE= tox
+
 ext-test:
 	python tests/flaskext_test.py --browse
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..15911b4c
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,5 @@
+[tox]
+envlist=py25,py26,py27
+
+[testenv]
+commands=make test