diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cdd0b8e14..68a7d09b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,21 +52,24 @@ jobs:
       matrix:
         include:
             - os: ubuntu-20.04
-              python-version: 3.6
+              python-version: '3.6'
               toxenv: py36-fuse2
             - os: ubuntu-20.04
-              python-version: 3.7
+              python-version: '3.7'
               toxenv: py37-fuse2
             - os: ubuntu-20.04
-              python-version: 3.8
+              python-version: '3.8'
               toxenv: py38-fuse3
             - os: ubuntu-20.04
-              python-version: 3.9
+              python-version: '3.9'
               toxenv: py39-fuse3
+            - os: ubuntu-20.04
+              python-version: '3.10-dev'
+              toxenv: py310-fuse3
             - os: macos-latest
               # note: it seems that 3.8 and 3.9 are currently broken,
               # neverending RuntimeError crashes...
-              python-version: 3.7
+              python-version: '3.7'
               toxenv: py37-fuse2
 
     env:
diff --git a/setup.py b/setup.py
index 09fb2fda5..89d12e221 100644
--- a/setup.py
+++ b/setup.py
@@ -268,6 +268,7 @@ def members_appended(*ds):
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Security :: Cryptography',
         'Topic :: System :: Archiving :: Backup',
     ],
diff --git a/tox.ini b/tox.ini
index 7b29f8a1b..7e8aaecad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{36,37,38,39}-{none,fuse2,fuse3}
+envlist = py{36,37,38,39,310}-{none,fuse2,fuse3}
 
 [testenv]
 deps =