diff --git a/.travis.yml b/.travis.yml
index b38d085..f461ee9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,11 @@ python:
 env:
 - DJANGO="Django>=1.8.0,<1.9.0"
 - DJANGO="Django>=1.11,<1.12.0"
+- DJANGO="Django>=2.0,<2.1"
+matrix:
+  exclude:
+  - python: '2.7'
+    env: DJANGO="Django>=2.0,<2.1"
 install:
 - pip install -q $DJANGO
 - pip install -q -r test_reqs.txt
diff --git a/djangowind/views.py b/djangowind/views.py
index 47addf7..132a6e7 100644
--- a/djangowind/views.py
+++ b/djangowind/views.py
@@ -16,7 +16,10 @@
 except ImportError:
     from django.contrib.sites.models import RequestSite
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_exempt
diff --git a/runtests.py b/runtests.py
index b0c841a..24eb175 100644
--- a/runtests.py
+++ b/runtests.py
@@ -16,6 +16,12 @@ def main():
     # Dynamically configure the Django settings with the minimum necessary to
     # get Django running tests
     settings.configure(
+        MIDDLEWARE=(
+            'django.contrib.sessions.middleware.SessionMiddleware',
+            'django.contrib.auth.middleware.AuthenticationMiddleware',
+            'django.contrib.messages.middleware.MessageMiddleware',
+        ),
+        # For django 1.8
         MIDDLEWARE_CLASSES=(
             'django.contrib.sessions.middleware.SessionMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',