diff --git a/.travis.yml b/.travis.yml
index 455e6fd..25739a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ python:
   - 3.6
   - 3.7
   - 3.8
+  - 3.9
   - pypy3
 jobs:
   include:
diff --git a/CHANGES.rst b/CHANGES.rst
index 87673fd..7ccf91e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -16,7 +16,7 @@ Changelog
 - Fixed an AttributeError in the undocumented remote task list feature
   (GH: #153).
 
-- Add Python 3.8 support.
+- Add Python 3.8 and 3.9 support.
 
 - Drop Python 2.7 and 3.5 support.
 
diff --git a/appveyor.yml b/appveyor.yml
index 72c91e8..43ddf8e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,6 +7,7 @@ environment:
     - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python37"
     - PYTHON: "C:\\Python38"
+    - PYTHON: "C:\\Python39"
 
 init:
   - "echo %PYTHON%"
diff --git a/setup.py b/setup.py
index a9dfd14..7c2c590 100755
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,7 @@ def read(filename):
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
diff --git a/tox.ini b/tox.ini
index 315788e..21fe914 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py36,py37,py38,pypy3,flake8
+    py36,py37,py38,py39,pypy3,flake8
 
 [testenv]
 setenv =