diff --git a/.travis.yml b/.travis.yml
index a1aaab2d2..9be12ea4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,18 @@
 sudo: no
 language: python
 cache: pip
+dist: xenial
 
 matrix:
   include:
-    # Need to use xenial in the docs build for a more recent version of sqlite.
     - python: 3.6
-      dist: xenial
       env: TOXENV=docs
     - python: 3.5
       env: TOXENV=prospector
     - python: 2.7
       env: TOXENV=py27-1.11
     - python: pypy
+      dist: trusty
       env: TOXENV=pypy-1.11
     - python: 3.4
       env: TOXENV=py34-1.11
@@ -28,6 +28,8 @@ matrix:
       env: TOXENV=py35-2.0
     - python: 3.6
       env: TOXENV=py36-2.0
+    - python: 3.7
+      env: TOXENV=py37-2.0
     - python: pypy3.5
       env: TOXENV=pypy3-2.0
     - python: 3.5
@@ -35,35 +37,28 @@ matrix:
     - python: 3.6
       env: TOXENV=py36-2.1
     - python: 3.7
-      dist: xenial
       env: TOXENV=py37-2.1
     - python: pypy3.5
       env: TOXENV=pypy3-2.1
     - python: 3.5
-      dist: xenial
       env: TOXENV=py35-2.2
     - python: 3.6
-      dist: xenial
       env: TOXENV=py36-2.2
     - python: 3.7
-      dist: xenial
       env: TOXENV=py37-2.2
     - python: pypy3.5
-      dist: xenial
       env: TOXENV=pypy3-2.2
     - python: 3.6
-      dist: xenial
       env: TOXENV=py36-master
     - python: 3.7
-      dist: xenial
       env: TOXENV=py37-master
   allow_failures:
     - python: 3.6
-      dist: xenial
       env: TOXENV=py36-master
     - python: 3.7
-      dist: xenial
       env: TOXENV=py37-master
+    - python: pypy3.5
+      env: TOXENV=pypy3-master
 install:
     - pip wheel -r tests/requirements.txt codecov
     - pip install virtualenv codecov tox
diff --git a/docs/authors.rst b/docs/authors.rst
index 2291e84f0..4e6dbf956 100644
--- a/docs/authors.rst
+++ b/docs/authors.rst
@@ -79,6 +79,7 @@ Authors
 * Matias Dinota
 * Michał Sałaban
 * Mike Lissner
+* Morgane Alonso
 * Olivier Sels
 * Olle Vidner
 * Paul Donohue
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6778816fb..57b857de6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -21,6 +21,10 @@ Other changes:
 
 - Extended validation of BICs to check for the correct character set
 
+- Run tests for Django 2.2 and Python 3.5, 3.6 and 3.7
+
+- Run tests for Django 2.0 and Python 3.7
+
 
 2.1   (2018-08-24)
 ------------------
diff --git a/setup.py b/setup.py
index 0f82e7f2d..e714cca5a 100644
--- a/setup.py
+++ b/setup.py
@@ -127,6 +127,7 @@ def find_package_data(where='.', package='',
         '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',
@@ -137,6 +138,7 @@ def find_package_data(where='.', package='',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP',
     ],
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
index 4454a7c1e..0f5f57104 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ args_are_paths = false
 envlist =
     docs,prospector
     {py27,pypy,py34,py35,py36,pypy3}-1.11
-    {py34,py35,py36,pypy3}-2.0
+    {py34,py35,py36,py37,pypy3}-2.0
     {py35,py36,py37,pypy3}-2.1
     {py35,py36,py37,pypy3}-2.2
     {py36,py37,pypy3}-master
@@ -25,7 +25,7 @@ deps =
     1.11: Django>=1.11,<2.0
     2.0: Django>=2.0,<2.1
     2.1: Django>=2.1,<2.2
-    2.2: Django==2.2rc1
+    2.2: Django>=2.2,<2.3
     master: https://github.com/django/django/archive/master.tar.gz
     -r{toxinidir}/tests/requirements.txt