diff --git a/setup.cfg b/setup.cfg
index 4767df9..047437c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,11 +2,11 @@
 name = refstack-client
 version = 0.1.1
 summary = Tempest test wrapper and result uploader for refstack
-description-file =
+description_file =
     README.rst
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page = https://refstack.openstack.org
+author_email = openstack-discuss@lists.openstack.org
+home_page = https://refstack.openstack.org
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers
@@ -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]
 packages =
diff --git a/tox.ini b/tox.ini
index 54cae15..5f48b69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py35,py36,py38,py27
+envlist = pep8,py3,py27
 minversion = 3.18
 skipsdist = True