diff --git a/tox.ini b/tox.ini
index de334588..6d10b3e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,7 @@ envlist =
     py33-django15,
     py33-django16,
     py33-django17,
+    py33-django18,
     py34-django16,
     py34-django17,
     py34-django18,
@@ -126,6 +127,10 @@ deps = {[django16]deps}
 basepython = python2.7
 deps = {[django17]deps}
 
+[testenv:py27-django18]
+basepython = python2.7
+deps = {[django18]deps}
+
 [testenv:py33-django15]
 basepython = python3.3
 deps = {[django15]deps}
@@ -138,6 +143,10 @@ deps = {[django16]deps}
 basepython = python3.3
 deps = {[django17]deps}
 
+[testenv:py33-django18]
+basepython = python3.3
+deps = {[django18]deps}
+
 [testenv:py34-django16]
 basepython = python3.4
 deps = {[django16]deps}
@@ -146,6 +155,10 @@ deps = {[django16]deps}
 basepython = python3.4
 deps = {[django17]deps}
 
+[testenv:py34-django18]
+basepython = python3.4
+deps = {[django18]deps}
+
 [testenv:custom-user-model]
 basepython = python3.4
 deps = {[django16]deps}