diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 51e315c5fd..4ab95a6c20 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     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]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
index c3cb704903..24162133cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,10 @@ jobs:
     env: TOXENV=py38
   - python: 3.8
     env: TOXENV=py38-functional
+  - python: 3.9
+    env: TOXENV=py39
+  - python: 3.9
+    env: TOXENV=py39-functional
   - stage: deploy
     script: skip
     deploy:
diff --git a/setup.py b/setup.py
index 22ec5b69a5..c2db8dcd78 100644
--- a/setup.py
+++ b/setup.py
@@ -79,5 +79,6 @@
         "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 0930582f4b..8ba4c3dd8d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-   py27, py3{5,6,7,8}
-   py27-functional, py3{5,6,7,8}-functional
+   py27, py3{5,6,7,8,9}
+   py27-functional, py3{5,6,7,8,9}-functional
 
 [testenv]
 passenv = TOXENV CI TRAVIS TRAVIS_*