diff --git a/tox.ini b/tox.ini
index 9fd99cb..ac68335 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,127 +1,23 @@
 [tox]
 envlist =
-    py26-1.4, py26-1.5, py26-1.6,
-    py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-trunk, py27-1.5-nosouth,
-    py32-1.5, py32-1.6, py32-1.7, py32-trunk,
-    py33-1.5, py33-1.6, py33-1.7, py33-trunk
+    py26-django{14,15,16},
+    py27-django14, py27-django15_nosouth,
+    py{27,32,33}-django{15,16,17,_trunk},
 
 [testenv]
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py32: python3.2
+    py33: python3.3
+
 deps =
-    South == 0.8.1
     coverage == 3.6
+    django14: Django==1.4.18
+    django15{,_nosouth}: Django==1.5.12
+    django16: Django==1.6.10
+    django17: Django==1.7.3
+    django_trunk: https://github.com/django/django/tarball/master
+    django{14,15,16}: South==1.0.2
+
 commands = coverage run -a setup.py test
-
-[testenv:py26-1.4]
-basepython = python2.6
-deps =
-    Django == 1.4.18
-    South == 0.7.6
-    coverage == 3.6
-
-[testenv:py26-1.5]
-basepython = python2.6
-deps =
-    Django == 1.5.5
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py26-1.6]
-basepython = python2.6
-deps =
-    https://github.com/django/django/tarball/stable/1.6.x
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.4]
-basepython = python2.7
-deps =
-    Django == 1.4.18
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.5]
-basepython = python2.7
-deps =
-    Django == 1.5.5
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.6]
-basepython = python2.7
-deps =
-    Django == 1.6.10
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.7]
-basepython = python2.7
-deps =
-    Django == 1.7.3
-    coverage == 3.6
-
-[testenv:py27-trunk]
-basepython = python2.7
-deps =
-    https://github.com/django/django/tarball/master
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py27-1.5-nosouth]
-basepython = python2.7
-deps =
-    Django == 1.5.12
-    coverage == 3.6
-
-[testenv:py32-1.5]
-basepython = python3.2
-deps =
-    Django == 1.5.12
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py32-1.6]
-basepython = python3.2
-deps =
-    Django == 1.6.10
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py32-1.7]
-basepython = python3.2
-deps =
-    Django == 1.7.3
-    coverage == 3.6
-
-[testenv:py32-trunk]
-basepython = python3.2
-deps =
-    https://github.com/django/django/tarball/master
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py33-1.5]
-basepython = python3.3
-deps =
-    Django == 1.5.12
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py33-1.6]
-basepython = python3.3
-deps =
-    Django == 1.6.10
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py33-1.7]
-basepython = python3.3
-deps =
-    Django == 1.7.3
-    coverage == 3.6
-
-[testenv:py33-trunk]
-basepython = python3.3
-deps =
-    https://github.com/django/django/tarball/master
-    South == 0.8.1
-    coverage == 3.6