diff --git a/.travis.yml b/.travis.yml
index 2c01a7d..ec6ca83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,30 @@
 language: python
-python:
-  - 2.6
-  - 2.7
-  - 3.2
-  - 3.3
-  - 3.4
-  - "pypy"
-env:
-  - DJANGO_VERSION=1.3.7
-  - DJANGO_VERSION=1.4.13
-  - DJANGO_VERSION=1.5.8
-  - DJANGO_VERSION=1.6.5
 install:
-  - pip install Django==$DJANGO_VERSION
-  - python setup.py install
-script: python setup.py test
-matrix:
-  exclude:
-    - python: 3.2
-      env: DJANGO_VERSION=1.4.5
-    - python: 3.2
-      env: DJANGO_VERSION=1.3.7
-    - python: 3.3
-      env: DJANGO_VERSION=1.4.5
-    - python: 3.3
-      env: DJANGO_VERSION=1.3.7
-    - python: 3.4
-      env: DJANGO_VERSION=1.4.5
-    - python: 3.4
-      env: DJANGO_VERSION=1.3.7
-    - python: "pypy"
-      env: DJANGO_VERSION=1.4.5
-    - python: "pypy"
-      env: DJANGO_VERSION=1.3.7
+  - pip install tox
+env:
+  - TOXENV=py26-django-14
+  - TOXENV=py27-django-14
+  - TOXENV=py26-django-15
+  - TOXENV=py27-django-15
+  - TOXENV=py32-django-15
+  - TOXENV=py33-django-15
+  - TOXENV=py34-django-15
+  - TOXENV=pypy-django-15
+  - TOXENV=py26-django-16
+  - TOXENV=py27-django-16
+  - TOXENV=py32-django-16
+  - TOXENV=py33-django-16
+  - TOXENV=py34-django-16
+  - TOXENV=pypy-django-17
+  - TOXENV=py26-django-17
+  - TOXENV=py27-django-17
+  - TOXENV=py32-django-17
+  - TOXENV=py33-django-17
+  - TOXENV=py34-django-17
+  - TOXENV=pypy-django-17
+  - TOXENV=py26-django-master
+  - TOXENV=py27-django-master
+  - TOXENV=py32-django-master
+  - TOXENV=py33-django-master
+  - TOXENV=py34-django-master
+  - TOXENV=pypy-django-master
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..d339d56
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,21 @@
+[tox]
+envlist = py26-django-14, py27-django-14, {py26,py27,py32,py33,py34,pypy}-django-{15,16,17,master}
+
+[testenv]
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py32: python3.2
+    py33: python3.3
+    py34: python3.4
+    pypy: pypy
+deps =
+    py26: unittest2
+    django-14: Django>=1.4,<1.5
+    django-15: Django>=1.5,<1.6
+    django-16: Django>=1.6,<1.7
+    django-17: Django>=1.7,<1.8
+    django-master: https://github.com/django/django/archive/master.zip
+usedevelop = true
+commands =
+    python setup.py test