diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e479b94..25c43d35 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 17f3031b..a6d062cb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,7 @@ Added
 ~~~~~
 - A new `exec` command to send autoprotocol to a test workcell
 - isort for automatic import sorting
+- Python 3.9 support. Added to test suite.
 - Example initial tests for `commands` file using `responses` pattern, starting with
   `submit` and `projects`.
 - Deprecation warning for existing `-i` option for `projects` command.
diff --git a/tox.ini b/tox.ini
index 5970daa1..715748a7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = clean, py36, py37, py38, stats, lint, docs
+envlist = clean, py36, py37, py38, py39, stats, lint, docs
 
 [testenv]
 commands = python setup.py test {posargs}