diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d4ae367..4ad23d3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, 3.10]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 253ed10..8e4af80 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,20 @@ Changelog
 
 Versions follow `Semantic Versioning <https://semver.org/>`_ (``<major>.<minor>.<patch>``).
 
+V1.9.0 (TBC)
+------------
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+
+* Dropped support for Python 3.6.
+
+Features
+^^^^^^^^
+
+* Added support for Python 3.10.
+
+
 v1.8.4 (2021-08-16)
 -------------------
 
diff --git a/setup.cfg b/setup.cfg
index 0a6ec59..291c32c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,17 +21,17 @@ classifiers =
     Natural Language :: English
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 project_urls =
     Documentation = https://sphinx-autoapi.readthedocs.io/en/latest/
 
 [options]
 packages = find:
 include_package_data = True
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
     astroid>=2.7
     Jinja2
diff --git a/tox.ini b/tox.ini
index 1fb0018..6c1608e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 isolated_build = true
 envlist =
     # Keep this in sync with .github/workflows/main.yml
-    py{36,37,38,39}
+    py{37,38,39,310}
     formatting
     lint
     docs