diff --git a/tox.ini b/tox.ini
index 76740e0ba..2bb33d795 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,19 @@
-[deps]
-base = 
+[tox]
+skipsdist = True
+usedevelop = True
+
+envlist = py{27,33,34}-dj{17,18}-{sqlite,postgres,mysql}
+
+
+[testenv]
+commands=coverage run runtests.py
+
+basepython =
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+
+deps =
     django-compressor>=1.4
     django-libsass>=0.2
     libsass==0.5.1
@@ -20,208 +34,16 @@ base =
     Willow==0.2
     coverage
 
-dj17 =
-    Django>=1.7.1,<1.8
+    py27: unicodecsv>=0.9.4
+    dj17: Django>=1.7.1,<1.8
+    dj18: Django>=1.8,<1.9
+    postgres: psycopg2>=2.6
+    mysql: mysqlclient==1.3.6
 
-dj18 =
-    https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
-
-py2 =
-    unicodecsv>=0.9.4
-
-py3 =
-
-
-[tox]
-skipsdist = True
-usedevelop = True
-
-envlist =
-    py27-dj17-postgres,
-    py27-dj17-sqlite,
-    py27-dj17-mysql,
-    py33-dj17-postgres,
-    py33-dj17-sqlite,
-    py34-dj17-postgres,
-    py34-dj17-mysql,
-    py34-dj17-sqlite,
-    py27-dj18-postgres,
-    py27-dj18-sqlite,
-    py27-dj18-mysql,
-    py33-dj18-postgres,
-    py33-dj18-sqlite,
-    py34-dj18-postgres,
-    py34-dj18-sqlite
-    py34-dj18-mysql,
-
-
-[testenv]
-commands=coverage run runtests.py
-
-
-[testenv:py27-dj17-postgres]
-basepython=python2.7
-deps =
-    {[deps]base}
-    {[deps]py2}
-    {[deps]dj17}
-    psycopg2==2.5.3
 setenv =
-    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
+    postgres: DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
 
-[testenv:py27-dj17-sqlite]
-basepython=python2.7
-deps =
-    {[deps]base}
-    {[deps]py2}
-    {[deps]dj17}
-setenv =
-    DATABASE_ENGINE=django.db.backends.sqlite3
-
-[testenv:py27-dj17-mysql]
-basepython=python2.7
-deps =
-    {[deps]base}
-    {[deps]py2}
-    {[deps]dj17}
-    mysqlclient==1.3.6
-setenv =
-    DATABASE_ENGINE=django.db.backends.mysql
-    DATABASE_USER=wagtail
-    DATABASE_HOST=localhost
-    DATABASE_USER=root
-
-[testenv:py33-dj17-postgres]
-basepython=python3.3
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj17}
-    psycopg2==2.5.3
-setenv =
-    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
-
-[testenv:py33-dj17-sqlite]
-basepython=python3.3
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj17}
-setenv =
-    DATABASE_ENGINE=django.db.backends.sqlite3
-
-[testenv:py34-dj17-postgres]
-basepython=python3.4
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj17}
-    psycopg2==2.5.3
-setenv =
-    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
-
-[testenv:py34-dj17-sqlite]
-basepython=python3.4
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj17}
-setenv =
-    DATABASE_ENGINE=django.db.backends.sqlite3
-
-[testenv:py34-dj17-mysql]
-basepython=python3.4
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj17}
-    mysqlclient==1.3.6
-setenv =
-    DATABASE_ENGINE=django.db.backends.mysql
-    DATABASE_USER=wagtail
-    DATABASE_HOST=localhost
-    DATABASE_USER=root
-
-
-[testenv:py27-dj18-postgres]
-basepython=python2.7
-deps =
-    {[deps]base}
-    {[deps]py2}
-    {[deps]dj18}
-    psycopg2==2.5.3
-setenv =
-    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
-
-[testenv:py27-dj18-sqlite]
-basepython=python2.7
-deps =
-    {[deps]base}
-    {[deps]py2}
-    {[deps]dj18}
-setenv =
-    DATABASE_ENGINE=django.db.backends.sqlite3
-
-[testenv:py27-dj18-mysql]
-basepython=python2.7
-deps =
-    {[deps]base}
-    {[deps]py2}
-    {[deps]dj18}
-    mysqlclient==1.3.6
-setenv =
-    DATABASE_ENGINE=django.db.backends.mysql
-    DATABASE_USER=wagtail
-    DATABASE_HOST=localhost
-    DATABASE_USER=root
-
-[testenv:py33-dj18-postgres]
-basepython=python3.3
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj18}
-    psycopg2==2.5.3
-setenv =
-    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
-
-[testenv:py33-dj18-sqlite]
-basepython=python3.3
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj18}
-setenv =
-    DATABASE_ENGINE=django.db.backends.sqlite3
-
-[testenv:py34-dj18-postgres]
-basepython=python3.4
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj18}
-    psycopg2==2.5.3
-setenv =
-    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
-
-[testenv:py34-dj18-sqlite]
-basepython=python3.4
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj18}
-setenv =
-    DATABASE_ENGINE=django.db.backends.sqlite3
-
-[testenv:py34-dj18-mysql]
-basepython=python3.4
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj18}
-    mysqlclient==1.3.6
-setenv =
-    DATABASE_ENGINE=django.db.backends.mysql
-    DATABASE_USER=wagtail
-    DATABASE_HOST=localhost
-    DATABASE_USER=root
+    mysql: DATABASE_ENGINE=django.db.backends.mysql
+    mysql: DATABASE_USER=wagtail
+    mysql: DATABASE_HOST=localhost
+    mysql: DATABASE_USER=root