diff --git a/.travis.yml b/.travis.yml
index 326c22d015..f54d1392ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,38 @@
 language: python
-# Test matrix
-python:
-    - 2.7
-    - 3.2
-    - 3.4
 env:
-    - DJANGO_VERSION=Django==1.6.5
-    #- DJANGO_VERSION=Django==1.7.0
+#  - TOXENV=py26-dj16-postgres
+  - TOXENV=py26-dj16-sqlite
+  - TOXENV=py27-dj16-postgres
+#  - TOXENV=py27-dj16-sqlite
+  - TOXENV=py32-dj16-postgres
+#  - TOXENV=py33-dj16-postgres
+  - TOXENV=py34-dj16-postgres
+  - TOXENV=py27-dj17-postgres
+#  - TOXENV=py27-dj17-sqlite
+#  - TOXENV=py32-dj17-postgres
+#  - TOXENV=py33-dj17-postgres
+  - TOXENV=py34-dj17-postgres
+
 # Services
 services:
   - redis-server
   - elasticsearch
+
 # Package installation
 install:
-  - python setup.py install
-  - pip install psycopg2 elasticsearch wand embedly
-  - pip install coveralls
+  - pip install tox coveralls
+
 # Pre-test configuration
 before_script:
   - psql -c 'create database wagtaildemo;' -U postgres
+
 # Run the tests
 script:
-  coverage run runtests.py
+  tox
+
 after_success:
   coveralls
+
 # Who to notify about build results
 notifications:
   email:
diff --git a/tox.ini b/tox.ini
index 2b17c65baf..30632a2212 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,39 @@
 [deps]
-dj16=
-    Django>=1.6,<1.7
+base = 
+    South==1.0.0
+    django-compressor>=1.4
+    django-libsass>=0.2
+    django-modelcluster>=0.3
+    django-taggit==0.12.0
+    django-treebeard==2.0
+    Pillow>=2.3.0
+    beautifulsoup4>=4.3.2
+    html5lib==0.999
+    Unidecode>=0.04.14
+    six==1.7.3
+    requests==2.3.0
     elasticsearch==1.1.0
     mock==1.0.1
+    Embedly
+    coverage
+
+dj16 =
+    Django>=1.6,<1.7
+
+
+dj17 =
+    https://github.com/django/django/archive/stable/1.7.x.zip#egg=django
+
+py2 =
+    unicodecsv>=0.9.4
+
+py3 =
+
 
 [tox]
+skipsdist = True
+usedevelop = True
+
 envlist =
     py26-dj16-postgres,
     py26-dj16-sqlite,
@@ -12,7 +41,13 @@ envlist =
     py27-dj16-sqlite,
     py32-dj16-postgres,
     py33-dj16-postgres,
-    py34-dj16-postgres
+    py34-dj16-postgres,
+
+    py27-dj17-postgres,
+    py27-dj17-sqlite,
+    py32-dj17-postgres,
+    py33-dj17-postgres,
+    py34-dj17-postgres
 
 # mysql not currently supported
 # (wagtail.wagtailimages.tests.TestImageEditView currently fails with a
@@ -27,11 +62,13 @@ envlist =
 
 
 [testenv]
-commands=./runtests.py
+commands=coverage run runtests.py
 
 [testenv:py26-dj16-postgres]
 basepython=python2.6
 deps =
+    {[deps]base}
+    {[deps]py2}
     {[deps]dj16}
     psycopg2==2.5.3
 setenv =
@@ -40,6 +77,8 @@ setenv =
 [testenv:py26-dj16-sqlite]
 basepython=python2.6
 deps =
+    {[deps]base}
+    {[deps]py2}
     {[deps]dj16}
 setenv =
     DATABASE_ENGINE=django.db.backends.sqlite3
@@ -47,6 +86,8 @@ setenv =
 [testenv:py26-dj16-mysql]
 basepython=python2.6
 deps =
+    {[deps]base}
+    {[deps]py2}
     {[deps]dj16}
     MySQL-python==1.2.5
 setenv =
@@ -56,6 +97,8 @@ setenv =
 [testenv:py27-dj16-postgres]
 basepython=python2.7
 deps =
+    {[deps]base}
+    {[deps]py2}
     {[deps]dj16}
     psycopg2==2.5.3
 setenv =
@@ -64,6 +107,8 @@ setenv =
 [testenv:py27-dj16-sqlite]
 basepython=python2.7
 deps =
+    {[deps]base}
+    {[deps]py2}
     {[deps]dj16}
 setenv =
     DATABASE_ENGINE=django.db.backends.sqlite3
@@ -71,6 +116,8 @@ setenv =
 [testenv:py27-dj16-mysql]
 basepython=python2.7
 deps =
+    {[deps]base}
+    {[deps]py2}
     {[deps]dj16}
     MySQL-python==1.2.5
 setenv =
@@ -80,6 +127,8 @@ setenv =
 [testenv:py32-dj16-postgres]
 basepython=python3.2
 deps =
+    {[deps]base}
+    {[deps]py3}
     {[deps]dj16}
     psycopg2==2.5.3
 setenv =
@@ -88,6 +137,8 @@ setenv =
 [testenv:py32-dj16-sqlite]
 basepython=python3.2
 deps =
+    {[deps]base}
+    {[deps]py3}
     {[deps]dj16}
 setenv =
     DATABASE_ENGINE=django.db.backends.sqlite3
@@ -95,6 +146,8 @@ setenv =
 [testenv:py33-dj16-postgres]
 basepython=python3.3
 deps =
+    {[deps]base}
+    {[deps]py3}
     {[deps]dj16}
     psycopg2==2.5.3
 setenv =
@@ -103,6 +156,8 @@ setenv =
 [testenv:py33-dj16-sqlite]
 basepython=python3.3
 deps =
+    {[deps]base}
+    {[deps]py3}
     {[deps]dj16}
 setenv =
     DATABASE_ENGINE=django.db.backends.sqlite3
@@ -110,6 +165,8 @@ setenv =
 [testenv:py34-dj16-postgres]
 basepython=python3.4
 deps =
+    {[deps]base}
+    {[deps]py3}
     {[deps]dj16}
     psycopg2==2.5.3
 setenv =
@@ -118,6 +175,95 @@ setenv =
 [testenv:py34-dj16-sqlite]
 basepython=python3.4
 deps =
+    {[deps]base}
+    {[deps]py3}
     {[deps]dj16}
 setenv =
     DATABASE_ENGINE=django.db.backends.sqlite3
+
+[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
+
+[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}
+    MySQL-python==1.2.5
+setenv =
+    DATABASE_ENGINE=django.db.backends.mysql
+    DATABASE_USER=wagtail
+
+[testenv:py32-dj17-postgres]
+basepython=python3.2
+deps =
+    {[deps]base}
+    {[deps]py3}
+    {[deps]dj17}
+    psycopg2==2.5.3
+setenv =
+    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
+
+[testenv:py32-dj17-sqlite]
+basepython=python3.2
+deps =
+    {[deps]base}
+    {[deps]py3}
+    {[deps]dj17}
+setenv =
+    DATABASE_ENGINE=django.db.backends.sqlite3
+
+[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