diff --git a/setup.cfg b/setup.cfg
index 162b9ac..f5190f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,6 +12,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Environment :: OpenStack
     Development Status :: 3 - Alpha
     Framework :: Setuptools Plugin
diff --git a/tox.ini b/tox.ini
index c873c25..c75079b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,pep8
+envlist = py38,py39,pep8
 minversion = 3.1.1
 skipsdist = True
 ignore_basepython_conflict = True