diff --git a/setup.cfg b/setup.cfg
index 9d0aa332e94..368df1e1ac0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,6 +30,8 @@ classifiers =
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 platforms = unix, linux, osx, cygwin, win32
 
 [options]
diff --git a/testing/code/test_source.py b/testing/code/test_source.py
index 0a2a98c0202..d2e3c134cd5 100644
--- a/testing/code/test_source.py
+++ b/testing/code/test_source.py
@@ -501,7 +501,7 @@ class A(object):
     class B(object):
         pass
 
-    B.__name__ = "B2"
+    B.__name__ = B.__qualname__ = "B2"
     assert getfslineno(B)[1] == -1
 
 
diff --git a/tox.ini b/tox.ini
index 61cb4bef0fe..f75a0610482 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,7 @@ envlist =
     py36
     py37
     py38
+    py39
     pypy
     pypy3
     {py27,py37}-{pexpect,xdist,twisted,numpy,pluggymaster}