diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 548321db..5c52b1dd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
   types:
     strategy:
       matrix:
-        python: [3.6, 3.7, 3.8]
+        python: [3.6, 3.7, 3.8, 3.9]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -38,7 +38,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python: [3.6, 3.7, 3.8]
+        python: [3.6, 3.7, 3.8, 3.9]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/AUTHORS b/AUTHORS
index 22228c3f..1c12eb8c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -31,3 +31,4 @@ Devesh Kumar Singh <deveshkusingh@gmail.com>
 Yesha Maggi <yesha.maggic@gmail.com>
 Cyril de Catheu <cdecatheu@gmail.com> (https://catheu.tech/)
 Thomas Miedema <thomasmiedema@gmail.com>
+Hugo van Kemenade (https://github.com/hugovk)
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 041b501e..6b1e569c 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -107,9 +107,9 @@ To pass options to ``pytest``, e.g. the name of a test, run:
 
     tox -e py -- tests/test_upload.py::test_exception_for_http_status
 
-Twine is continuously tested against Python 3.6, 3.7, and 3.8 using `GitHub
-Actions`_. To run the tests against a specific version, e.g. Python 3.6, you
-will need it installed on your machine. Then, run:
+Twine is continuously tested against Python 3.6, 3.7, 3.8, and 3.9 using
+`GitHub Actions`_. To run the tests against a specific version, e.g. Python
+3.6, you will need it installed on your machine. Then, run:
 
 .. code-block:: console
 
diff --git a/setup.cfg b/setup.cfg
index c5290fe4..d01eef8d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,6 +25,7 @@ classifiers =
     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
 
 [options]
diff --git a/tox.ini b/tox.ini
index 769264ea..8de21d14 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.4
-envlist = lint,types,py{36,37,38},integration,docs
+envlist = lint,types,py{36,37,38,39},integration,docs
 
 [testenv]
 deps =