diff --git a/.travis.yml b/.travis.yml
index 5320336..7836e53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
 env:
   - DJANGO=1.7
   - DJANGO=1.8
@@ -11,6 +12,7 @@ env:
   - DJANGO=1.10
   - DJANGO=1.11
   - DJANGO=2.0
+  - DJANGO=2.1
 matrix:
   exclude:
     # Python/Django combinations that aren't officially supported
diff --git a/setup.py b/setup.py
index b5b84b4..a078f51 100644
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,7 @@ setup(
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
@@ -92,6 +93,7 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
     platforms=['any'],
     url='https://github.com/jcassee/django-analytical',
diff --git a/tox.ini b/tox.ini
index 23884ac..6462cce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,9 @@ envlist =
     py{27,34,35}-django18
     py{27,34,35}-django19
     py{27,34,35}-django110
-    py{27,34,35,36}-django111
-    py{34,35,36}-django20
+    py{27,34,35,36,37}-django111
+    py{34,35,36,37}-django20
+    py{34,35,36,37}-django21
     flake8
     readme
 
@@ -23,6 +24,7 @@ deps =
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 whitelist_externals = sh
 
@@ -42,6 +44,7 @@ DJANGO =
     1.10: django110
     1.11: django111
     2.0: django20
+    2.1: django21
 
 [flake8]
 max-line-length = 100