diff --git a/setup.cfg b/setup.cfg
index 146c28a..6ccba15 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Development Status :: 5 - Production/Stable
     Natural Language :: English
     Environment :: OpenStack
diff --git a/tox.ini b/tox.ini
index a42d5c7..dea68a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,6 +44,9 @@ basepython = python3.6
 [testenv:py38]
 basepython = python3.8
 
+[testenv:py39]
+basepython = python3.9
+
 [testenv:docs]
 deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -b html doc/source doc/build/html