diff --git a/Vagrantfile b/Vagrantfile
index 28b58c1c24..122052e31d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -217,9 +217,10 @@ def install_pythons(boxname)
     . ~/.bash_profile
     pyenv install 3.5.3  # tests, 3.5.3 is first to support openssl 1.1
     pyenv install 3.6.2  # tests
-    pyenv install 3.7.9  # binary build, use latest 3.7.x release
+    pyenv install 3.7.11  # binary build, use latest 3.7.x release
     pyenv install 3.8.0  # tests
     pyenv install 3.9.0  # tests
+    pyenv install 3.10-dev  # tests
     pyenv rehash
   EOF
 end
@@ -237,8 +238,8 @@ def build_pyenv_venv(boxname)
     . ~/.bash_profile
     cd /vagrant/borg
     # use the latest 3.7 release
-    pyenv global 3.7.9
-    pyenv virtualenv 3.7.9 borg-env
+    pyenv global 3.7.11
+    pyenv virtualenv 3.7.11 borg-env
     ln -s ~/.pyenv/versions/borg-env .
   EOF
 end
@@ -299,8 +300,8 @@ def run_tests(boxname)
     . ../borg-env/bin/activate
     if which pyenv 2> /dev/null; then
       # for testing, use the earliest point releases of the supported python versions:
-      pyenv global 3.5.3 3.6.2 3.7.9 3.8.0 3.9.0
-      pyenv local 3.5.3 3.6.2 3.7.9 3.8.0 3.9.0
+      pyenv global 3.5.3 3.6.2 3.7.11 3.8.0 3.9.0 3.10-dev
+      pyenv local 3.5.3 3.6.2 3.7.11 3.8.0 3.9.0 3.10-dev
     fi
     # otherwise: just use the system python
     if which fakeroot 2> /dev/null; then
diff --git a/setup.py b/setup.py
index e20ac1afed..87e93d252e 100644
--- a/setup.py
+++ b/setup.py
@@ -882,6 +882,7 @@ def run(self):
         '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',
     ],