diff --git a/setup.cfg b/setup.cfg
index 3eb39a1436..29dbb8452f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,7 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [files]
 packages = openstack_releases
diff --git a/tox.ini b/tox.ini
index 48d2372e1f..419248c8c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,6 @@
 [tox]
 minversion = 3.2.0
 envlist = py3,validate,pep8,bashate,docs
-skipsdist = True
-ignore_basepython_conflict=true
-# note(elod.illes): setuptools capping / pinning does not work as it is
-# pinned inside virtualenv. So to cap / pin setuptools we need to do it
-# via virtualenv. Virtualenv 20.13.3 is the last version that holds
-# setuptools < 61.0.0
-requires = virtualenv==20.13.3
 
 [testenv]
 usedevelop=True
@@ -24,7 +17,8 @@ setenv =
    OS_STDERR_CAPTURE=1
    OS_DEBUG=1
    OS_LOG_CAPTURE=1
-basepython = python3
+allowlist_externals =
+    {toxinidir}/tools/*
 deps =
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt