diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 7d826ac4..b07bc8fb 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
index 238470ee..f69f56d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ python:
   - 3.6
   - 3.7
   - 3.8
+  - 3.9-dev
   - pypy3
 matrix:
   include:
diff --git a/setup.py b/setup.py
index 6deb6ae6..b5639c73 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,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 :: PyPy",
     "License :: OSI Approved :: Apache Software License",
     "Topic :: Software Development :: Testing",