diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index fa07088..d15cd64 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['2.7', '3.5', '3.6', '3.7', '3.8']
+        python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9']
 
     name: Build with Python ${{ matrix.python-version }}
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76ddaba..80c4869 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.5.0
+
+* Add Python 3.9 support
+
+Switched from Travis CI to GitHub Actions for tests
+
 ## 2.4.1
 
 * Add Django 3.1 support
diff --git a/setup.py b/setup.py
index 8202e6c..15881c2 100644
--- a/setup.py
+++ b/setup.py
@@ -67,5 +67,6 @@ setup(
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ],
 )
diff --git a/tox.ini b/tox.ini
index c2c317b..aa28ad5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,9 @@
 [tox]
 envlist =
     py27-django111
-    py{35,36,37,38}-django{111,20,21,22}
-    py{36,37,38}-django{30,31}
+    py{35,36,37,38}-django{111,20,21}
+    py{35,36,37,38,39}-django22
+    py{36,37,38,39}-django{30,31}
     lint
 
 [gh-actions]
@@ -12,6 +13,7 @@ python =
     3.6: py36
     3.7: py37
     3.8: py38
+    3.9: py39
 
 [testenv]
 commands = ./manage.py test --no-input {posargs}