diff --git a/setup.cfg b/setup.cfg
index 7213ae821..f3168e4fe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 data_files =
diff --git a/tox.ini b/tox.ini
index 82346468b..399cae1eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.18.0
-envlist = py36,py38,pep8,docs
+envlist = py39,py38,py36,pep8,docs
 skipsdist = True
 ignore_basepython_conflict = True