diff --git a/.travis.yml b/.travis.yml
index edaae71..cc17a3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,36 +1,47 @@
 language: python
 
-python:
-  - 2.6
-  - 2.7
-  - 3.2
-  - 3.3
+python: 2.7
 
 env:
-  - DJANGO=Django==1.4.10 SOUTH=1
-  - DJANGO=Django==1.5.5 SOUTH=1
-  - DJANGO=Django==1.6.1 SOUTH=1
-  - DJANGO=https://github.com/django/django/tarball/master SOUTH=1
+  - TOXENV=py26-django14
+  - TOXENV=py26-django15
+  - TOXENV=py26-django16
+  - TOXENV=py27-django14
+  - TOXENV=py27-django15
+  - TOXENV=py27-django15_nosouth
+  - TOXENV=py27-django16
+  - TOXENV=py27-django17
+  - TOXENV=py27-django18
+  - TOXENV=py27-django_trunk
+  - TOXENV=py32-django15
+  - TOXENV=py32-django16
+  - TOXENV=py32-django17
+  - TOXENV=py32-django18
+  - TOXENV=py32-django_trunk
+  - TOXENV=py33-django15
+  - TOXENV=py33-django16
+  - TOXENV=py33-django17
+  - TOXENV=py33-django18
+  - TOXENV=py33-django_trunk
+  - TOXENV=py34-django17
+  - TOXENV=py34-django18
+  - TOXENV=py34-django_trunk
 
 install:
-  - pip install $DJANGO
-  - pip install coverage coveralls
-  - sh -c "if [ '$SOUTH' = '1' ]; then pip install South==0.8.1; fi"
+  - pip install --upgrade pip setuptools tox virtualenv coveralls
 
 script:
-  - coverage run -a setup.py test
-  - coverage report
+  - tox
 
 matrix:
-  exclude:
-   - python: 2.6
-     env: DJANGO=https://github.com/django/django/tarball/master SOUTH=1
-   - python: 3.2
-     env: DJANGO=Django==1.4.10 SOUTH=1
-   - python: 3.3
-     env: DJANGO=Django==1.4.10 SOUTH=1
-  include:
-   - python: 2.7
-     env: DJANGO=Django==1.5.5 SOUTH=0
+  allow_failures:
+    - env: TOXENV=py27-django18
+    - env: TOXENV=py32-django18
+    - env: TOXENV=py33-django18
+    - env: TOXENV=py34-django18
+    - env: TOXENV=py27-django_trunk
+    - env: TOXENV=py32-django_trunk
+    - env: TOXENV=py33-django_trunk
+    - env: TOXENV=py34-django_trunk
 
 after_success: coveralls
diff --git a/tox.ini b/tox.ini
index b754bc7..5255cf5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,109 +1,26 @@
 [tox]
 envlist =
-    py26-1.4, py26-1.5, py26-1.6,
-    py27-1.4, py27-1.5, py27-1.6, py27-trunk, py27-1.5-nosouth,
-    py32-1.5, py32-1.6, py32-trunk,
-    py33-1.5, py33-1.6, py33-trunk
+    py26-django{14,15,16},
+    py27-django14, py27-django15_nosouth,
+    py{27,32,33}-django{15,16,17,18,_trunk},
+    py34-django{17,18,_trunk},
 
 [testenv]
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py32: python3.2
+    py33: python3.3
+    py34: python3.4
+
 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
+    django18: Django==1.8a1
+    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.10
-    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.10
-    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.1
-    South == 0.8.1
-    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.5
-    coverage == 3.6
-
-[testenv:py32-1.5]
-basepython = python3.2
-deps =
-    Django == 1.5.5
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py32-1.6]
-basepython = python3.2
-deps =
-    Django == 1.6.1
-    South == 0.8.1
-    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.5
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py33-1.6]
-basepython = python3.3
-deps =
-    Django == 1.6.1
-    South == 0.8.1
-    coverage == 3.6
-
-[testenv:py33-trunk]
-basepython = python3.3
-deps =
-    https://github.com/django/django/tarball/master
-    South == 0.8.1
-    coverage == 3.6
diff --git a/update_travis_envs.sh b/update_travis_envs.sh
new file mode 100755
index 0000000..8b5d559
--- /dev/null
+++ b/update_travis_envs.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Updates .travis.yml envs based on tox.ini configuration.
+
+# Removing old environment list
+cp ./.travis.yml ./.travis.yml.bak
+cat ./.travis.yml.bak | grep -v "^  - TOXENV=" > ./.travis.yml
+
+# Inserting envs based on list generated by tox
+for env_name in $(tox --listenvs | sort -r); do
+    sed -i "/^env:$/a\
+\ \ - TOXENV=${env_name}" ./.travis.yml;
+done