diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86bd9f27c5064700cdeb1c8c609476aed9139162..ee7c5c5cdc2ee2c4f8618c2e00a4175ca48a014b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,3 +30,7 @@ py36-django111:
     stage: test
     script: $HOME/tox/bin/tox -e 'py36-django111'
 
+py36-django20:
+    stage: test
+    script: $HOME/tox/bin/tox -e 'py36-django20'
+
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 8d1d365d7cd49e737aefcbd351dd8f2a2686f45c..9e0cc377473d8a996456c3d260b5893257513d2e 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -26,18 +26,18 @@ INSTALLED_APPS = (
     'tests'
 )
 
-MIDDLEWARE_CLASSES = ( 
+MIDDLEWARE = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.auth.middleware.RemoteUserMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
 )
+# compat for Django 1.8
+MIDDLEWARE_CLASSES = MIDDLEWARE
 
 ROOT_URLCONF = 'tests.urls'
 
diff --git a/tests/urls.py b/tests/urls.py
index c974b39cd1a5d44240e1a5c4ba0c73cb9f3d498f..9cd1a67f82118392e892c02f31fb9fc1cdfd0bbd 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from django.conf.urls import include, url 
+from django.conf.urls import url
 from django.contrib import admin
 
-urlpatterns = [ 
-    url(r'^admin/', include(admin.site.urls)),
+urlpatterns = [
+    url(r'^admin/', admin.site.urls)
 ]
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 5801135f31e1e5f046a63ce8611f57a78550c661..5fb65dfe22b5d5258a07e648bb08ade0516ce2e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,9 @@
 
 [tox]
 skipsdist = true
-envlist = py{27,36}-django{18,110,111}
+envlist = py{27,36}-django{18,110,111},
+          py{36}-django{20}
+
 
 [testenv]
 #alwayscopy = True
@@ -21,6 +23,7 @@ deps =
     django18: Django >= 1.8, < 1.9
     django110: Django >= 1.10, < 1.11
     django111: Django >= 1.11, < 2
+    django20: Django >= 2, < 2.1
 
 setenv =
     DJANGO_LIVE_TEST_SERVER_ADDRESS=localhost:9000-9200