diff --git a/.travis.yml b/.travis.yml
index 285f446..5cff936 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,17 @@ env:
   - 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
 
 install:
diff --git a/tox.ini b/tox.ini
index ac68335..d22b9cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     py26-django{14,15,16},
     py27-django14, py27-django15_nosouth,
-    py{27,32,33}-django{15,16,17,_trunk},
+    py{27,32,33}-django{15,16,17,18,_trunk},
 
 [testenv]
 basepython =
@@ -17,6 +17,7 @@ deps =
     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