diff --git a/.travis.yml b/.travis.yml
index c5796eeb..86fa3ec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: xenial
 language: python
 sudo: false
 python:
@@ -5,6 +6,7 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
 
 install:
     pip install -r test-requirements.txt
diff --git a/CHANGELOG b/CHANGELOG
index b0813d4e..a1029765 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,9 @@ Version 2.6, TBD
 * Bugfix: Pass `user` instance instead of `user.get_username()` to template
 context. -
 `#350 <https://github.com/macropin/django-registration/pull/350>_`
+* Feature: Add testing for Django 2.2 and Python 3.7 (no code changes
+  required). - `#352
+  <https://github.com/macropin/django-registration/pull/352>_`
 
 Version 2.5, 27 October, 2018
 ----------------
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 452cfc51..d85206e5 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -3,5 +3,5 @@
 Release notes
 =============
 
-The |version| release of |project| supports Python 2.7, 3.4, 3.5, 3.6 and
-Django 1.11, 2.0, and 2.1.
+The |version| release of |project| supports Python 2.7, 3.4, 3.5, 3.6, 3.7 and
+Django 1.11, 2.0, 2.1, and 2.2.
diff --git a/setup.py b/setup.py
index 530cedbc..fb25ae43 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,7 @@ def run_tests(self):
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
@@ -50,6 +51,7 @@ def run_tests(self):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Utilities'
     ],
diff --git a/tox.ini b/tox.ini
index b4d34452..894bb4a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,9 +5,10 @@
 
 [tox]
 envlist =
-    {py27,py34,py35,py36}-django111,
-    {py34,py35,py36}-django20,
-    {py35,py36}-django21,
+    py{27,34,35,36,37}-django111,
+    py3{4,5,6,7}-django20,
+    py3{5,6,7}-django21,
+    py3{5,6,7}-django22,
 
 [testenv]
 commands =
@@ -17,6 +18,7 @@ deps =
   django111: Django>=1.11,<2.0
   django20: Django>=2.0,<2.1
   django21: Django>=2.1,<2.2
+  django22: Django>=2.2a1,<3.0
 
 [travis]
 python =
@@ -24,5 +26,4 @@ python =
   3.4: py34
   3.5: py35
   3.6: py36
-# TODO add python 3.7 support when travis adds this.
-# https://github.com/travis-ci/travis-ci/issues/9815
+  3.7: py37