diff --git a/.travis.yml b/.travis.yml
index fd5f888..d132381 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,18 @@
 language: python
 python:
-    - "2.5"
     - "2.6"
     - "2.7"
+    - "3.3"
 env:
-    - DJANGO_VERSION=1.2
-    - DJANGO_VERSION=1.3
-    - DJANGO_VERSION=1.4
-install: pip install Django==$DJANGO_VERSION django-markupfield markdown docutils --use-mirrors
-script: django-admin.py test --settings=example.settings --pythonpath=. markupwiki
+    - DJANGO_PACKAGE="Django<1.5"
+    - DJANGO_PACKAGE="Django>=1.5,<1.6"
+    - DJANGO_PACKAGE="Django>=1.6,<1.7"
+install: pip install $DJANGO_PACKAGE markdown docutils --use-mirrors
+script: django-admin.py test --settings=example.settings --pythonpath=.
+matrix:
+    exclude:
+        - python: "3.3"
+          env: DJANGO_PACKAGE="Django<1.5"
 notifications:
     email:
         - james.p.turk@gmail.com