diff --git a/.travis.yml b/.travis.yml
index 794786d..16701ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,22 @@
 language: python
-python:
-- "2.6"
-- "2.7"
-- "3.3"
-- "3.4"
-env:
-- DJANGO="Django>=1.4,<1.5"
-- DJANGO="Django>=1.5,<1.6"
-- DJANGO="Django>=1.6,<1.7"
-- DJANGO="Django>=1.7,<1.8"
-matrix:
-  exclude:
-    - python: "2.6"
-      env: DJANGO="Django>=1.7,<1.8"
-    - python: "3.3"
-      env: DJANGO="Django>=1.4,<1.5"
-    - python: "3.4"
-      env: DJANGO="Django>=1.4,<1.5"
 install:
-- pip install $DJANGO
+  - pip install tox
 script:
-- python setup.py test
+  - tox
+env:  # generate list with: $ tox -l | xargs -I ITEM echo "  - TOXENV="ITEM
+  - TOXENV=py26-django14
+  - TOXENV=py26-django15
+  - TOXENV=py26-django16
+  - TOXENV=py27-django14
+  - TOXENV=py27-django15
+  - TOXENV=py27-django16
+  - TOXENV=py27-django17
+  - TOXENV=py27-django18
+  - TOXENV=py33-django15
+  - TOXENV=py33-django16
+  - TOXENV=py33-django17
+  - TOXENV=py33-django18
+  - TOXENV=py34-django15
+  - TOXENV=py34-django16
+  - TOXENV=py34-django17
+  - TOXENV=py34-django18
diff --git a/tox.ini b/tox.ini
index bb082ea..8621a6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,62 +1,19 @@
 [tox]
 envlist =
-        py2.6-django1.4,py2.6-django1.5,py2.6-django1.6,
-        py2.7-django1.4,py2.7-django1.5,py2.7-django1.6,
-        py2.7-django1.7,
-        py3.3-django1.5,py3.3-django1.6,py3.3-django1.7,
-        py3.4-django1.5,py3.4-django1.6,py3.4-django1.7,
+    py{26}-django{14,15,16},
+    py{27}-django{14,15,16,17,18},
+    py{33,34}-django{15,16,17,18},
 
 [testenv]
 commands = python -Wall setup.py test
-
-[testenv:py2.6-django1.4]
-basepython = python2.6
-deps = Django>=1.4,<1.5
-
-[testenv:py2.6-django1.5]
-basepython = python2.6
-deps = Django>=1.5,<1.6
-
-[testenv:py2.6-django1.6]
-basepython = python2.6
-deps = Django>=1.6,<1.7
-
-[testenv:py2.7-django1.4]
-basepython = python2.7
-deps = Django>=1.4,<1.5
-
-[testenv:py2.7-django1.5]
-basepython = python2.7
-deps = Django>=1.5,<1.6
-
-[testenv:py2.7-django1.6]
-basepython = python2.7
-deps = Django>=1.6,<1.7
-
-[testenv:py2.7-django1.7]
-basepython = python2.7
-deps = Django>=1.7,<1.8
-
-[testenv:py3.3-django1.5]
-basepython = python3.3
-deps = Django>=1.7,<1.8
-
-[testenv:py3.3-django1.6]
-basepython = python3.3
-deps = Django>=1.6,<1.7
-
-[testenv:py3.3-django1.7]
-basepython = python3.3
-deps = Django>=1.7,<1.8
-
-[testenv:py3.4-django1.5]
-basepython = python3.4
-deps = Django>=1.7,<1.8
-
-[testenv:py3.4-django1.6]
-basepython = python3.4
-deps = Django>=1.6,<1.7
-
-[testenv:py3.4-django1.7]
-basepython = python3.4
-deps = Django>=1.7,<1.8
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+deps =
+    django14: Django>=1.4,<1.5
+    django15: Django>=1.5,<1.6
+    django16: Django>=1.6,<1.7
+    django17: Django>=1.7,<1.8
+    django18: Django>=1.8,<1.9