diff --git a/.travis.yml b/.travis.yml
index b40ca56..d08855f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ matrix:
       env: TOX_ENV=py37
     - python: 3.8
       env: TOX_ENV=py38
+    - python: 3.9
+      env: TOX_ENV=py39
 
 install:
   - pip install tox
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18ddc9f..ec4ba00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- Python 3.9 support
 
 ### Removed
 - Python 2.7 & 3.5 support
diff --git a/appveyor.yml b/appveyor.yml
index c7f39f5..7b1a8b3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,8 @@
 # What Python version is installed where:
 # http://www.appveyor.com/docs/installed-software#python
 
+image: Visual Studio 2019
+
 environment:
   matrix:
     - PYTHON: "C:\\Python36"
@@ -12,6 +14,8 @@ environment:
     - PYTHON: "C:\\Python38"
       TOX_ENV: "py38"
 
+    - PYTHON: "C:\\Python39"
+      TOX_ENV: "py39"
 
 init:
   - "%PYTHON%/python -V"
diff --git a/setup.py b/setup.py
index 00e17a3..f24b215 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@
         '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',
         'Operating System :: OS Independent',
         'License :: OSI Approved :: MIT License',