diff --git a/.travis.yml b/.travis.yml
index 602ec9b..a77488f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ matrix:
       env: TOXENV=py35-django20
     - python: 3.5
       env: TOXENV=py35-django21
+    - python: 3.5
+      env: TOXENV=py35-django22
 
     - python: 3.6
       env: TOXENV=py36-django111
@@ -23,6 +25,8 @@ matrix:
       env: TOXENV=py36-django20
     - python: 3.6
       env: TOXENV=py36-django21
+    - python: 3.6
+      env: TOXENV=py36-django22
 
     - python: 3.7
       env: TOXENV=py37-django111
@@ -30,6 +34,8 @@ matrix:
       env: TOXENV=py37-django20
     - python: 3.7
       env: TOXENV=py37-django21
+    - python: 3.7
+      env: TOXENV=py37-django22
 
     - python: 3.6
       env: TOXENV=lint
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3370324..3730fe4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ Additionally, the linter now needs to be added the to the `INSTALLED_APPS` in yo
 * The linter is now much faster: we don't setup django once for each migration
 * The linter is now more robust: we rely on Django internals to discover migrations
 * Clean up of the testing setup: it is cleaner, less brittle and we have more confidence that it works
+* Added support for Django 2.2
+* Dropped support for Python 3.4
 
 Fixed bugs:
 
diff --git a/setup.py b/setup.py
index 68d6ec9..f84d85a 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ setup(
         "Framework :: Django :: 1.11",
         "Framework :: Django :: 2.0",
         "Framework :: Django :: 2.1",
+        "Framework :: Django :: 2.2",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
diff --git a/tox.ini b/tox.ini
index f644d37..22f055d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     py27-django111
-    py{35,36,37}-django{111,20,21}
+    py{35,36,37}-django{111,20,21,22}
     lint
 
 [testenv]
@@ -11,7 +11,8 @@ pip_pre = true
 deps =
     django111: django>=1.11,<2.0
     django20: django>=2.0,<2.1
-    django21: django>=2.1
+    django21: django>=2.1,<2.2
+    django22: django>=2.2
     appdirs==1.4.3
     py27: mock==2.0.0