diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 01c6195..1232dee 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,10 +13,10 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: Install dev dependencies
+    - name: Install lint dependencies
       run: pip install -r requirements/lint.txt
     - name: Check order of Python imports
       run: isort --check-only --diff --quiet .
diff --git a/.travis.yml b/.travis.yml
index 1ed80ab..a5d8c78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ python:
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9"
 
 before_install:
   - pip install codecov
diff --git a/README.md b/README.md
index 222a688..c0d647d 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ magics in Jupyter notebooks.
 pip install jupyter_spaces
 ```
 
-`jupyter_spaces` supports Python versions `3.5`, `3.6`, `3.7` and `3.8`.
+`jupyter_spaces` supports Python versions `3.5`, `3.6`, `3.7`, `3.8` and `3.9`.
 
 ## Usage
 
diff --git a/setup.cfg b/setup.cfg
index 4c64d25..e279992 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,6 +28,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [options]
 packages = jupyter_spaces
diff --git a/tox.ini b/tox.ini
index 2150ca2..c6f0a93 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,8 @@
 envlist =
     {py35,py36,py37}-ipython{5,6,7}
     py38-ipython7
-    ; ipython73 adds compatibility with py38
+    py39-ipython7
+    ; ipython73 adds compatibility with py38+
 
 [testenv]
 deps =