diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 7933b2bfc..b5a413d01 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install dependencies
         run: pip install tox
       - name: Build docs
@@ -34,7 +34,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install dependencies
         run: pip install tox twine wheel
       - name: Check twine readme rendering
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b1254bb96..43ea68a24 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,9 @@ jobs:
             toxenv: py38
           - python-version: 3.9
             toxenv: py39
-          - python-version: 3.9
+          - python-version: "3.10"
+            toxenv: py310
+          - python-version: "3.10"
             toxenv: smoke
     steps:
       - uses: actions/checkout@v2
@@ -50,7 +52,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install dependencies
         run: pip install tox pytest-github-actions-annotate-failures
       - name: Run tests
@@ -71,7 +73,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install dependencies
         run: pip install tox pytest-github-actions-annotate-failures
       - name: Run tests
diff --git a/setup.py b/setup.py
index 589f9a4e2..c809142f4 100644
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,7 @@ def get_version():
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     extras_require={
         "autocompletion": ["argcomplete>=1.10.0,<2"],
diff --git a/tox.ini b/tox.ini
index 8ba8346f6..da1f1e858 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py39,py38,py37,py36,pep8,black,twine-check,mypy,isort
+envlist = py310,py39,py38,py37,py36,pep8,black,twine-check,mypy,isort
 
 [testenv]
 passenv = GITLAB_IMAGE GITLAB_TAG