diff --git a/.github/workflows/stubtest-unused-whitelist.yml b/.github/workflows/stubtest-unused-whitelist.yml
index 81a31b8f8..ef3f4118a 100644
--- a/.github/workflows/stubtest-unused-whitelist.yml
+++ b/.github/workflows/stubtest-unused-whitelist.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9-dev]
       fail-fast: false
 
     steps:
diff --git a/.github/workflows/stubtest.yml b/.github/workflows/stubtest.yml
index 179bcfe98..65e66f2bb 100644
--- a/.github/workflows/stubtest.yml
+++ b/.github/workflows/stubtest.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9-dev]
       fail-fast: false
 
     steps:
diff --git a/tests/stubtest_whitelists/py39.txt b/tests/stubtest_whitelists/py39.txt
index 5b12f6ddf..324d961eb 100644
--- a/tests/stubtest_whitelists/py39.txt
+++ b/tests/stubtest_whitelists/py39.txt
@@ -2,7 +2,6 @@ _ast.ImportFrom.level
 _dummy_thread
 _thread.ExceptHookArgs
 _thread._ExceptHookArgs
-_weakref.getweakrefcount
 ast.Bytes.__new__
 ast.Ellipsis.__new__
 ast.ExtSlice.__new__
@@ -12,71 +11,40 @@ ast.NameConstant.__new__
 ast.Num.__new__
 ast.Str.__new__
 asyncio.AbstractEventLoop.sock_sendfile
-asyncio.compat  # removed in 3.7
+asyncio.compat  # module removed in 3.7
 asyncio.Future.__init__
 asyncio.Future._callbacks
 asyncio.events.AbstractEventLoop.sock_sendfile
 asyncio.futures.Future.__init__
 asyncio.futures.Future._callbacks
 asyncio.proactor_events._ProactorBasePipeTransport.__del__
-builtins.bytearray.extend
-builtins.bytearray.pop
 builtins.compile
 builtins.dict.get
 builtins.reversed
-bz2.BZ2Compressor.compress
-bz2.BZ2File.read
-bz2.BZ2File.read1
-bz2.BZ2File.readline
-bz2.BZ2File.seek
-codecs.lookup
-codecs.lookup_error
-codecs.register
 collections.AsyncGenerator.ag_await
 collections.AsyncGenerator.ag_code
 collections.AsyncGenerator.ag_frame
 collections.AsyncGenerator.ag_running
-collections.Container.__contains__
 collections.ItemsView.__reversed__
 collections.KeysView.__reversed__
-collections.OrderedDict.fromkeys
-collections.OrderedDict.setdefault
 collections.ValuesView.__reversed__
 collections.abc.AsyncGenerator.ag_await
 collections.abc.AsyncGenerator.ag_code
 collections.abc.AsyncGenerator.ag_frame
 collections.abc.AsyncGenerator.ag_running
-collections.abc.Container.__contains__
 collections.abc.ItemsView.__reversed__
 collections.abc.KeysView.__reversed__
 collections.abc.ValuesView.__reversed__
-compileall.compile_dir
-compileall.compile_file
-concurrent.futures.Executor.submit
-concurrent.futures.ProcessPoolExecutor.map
 concurrent.futures.ProcessPoolExecutor.shutdown
-concurrent.futures.ProcessPoolExecutor.submit
 concurrent.futures.ThreadPoolExecutor.shutdown
-concurrent.futures.ThreadPoolExecutor.submit
-concurrent.futures._base.Executor.submit
 concurrent.futures.process.ProcessPoolExecutor.shutdown
-concurrent.futures.process.ProcessPoolExecutor.submit
 concurrent.futures.thread.ThreadPoolExecutor.shutdown
-concurrent.futures.thread.ThreadPoolExecutor.submit
-contextlib.AbstractContextManager.__exit__
-contextlib.AsyncExitStack.callback
-contextlib.AsyncExitStack.push_async_callback
-contextlib.ExitStack.callback
 contextvars.Context.__init__
 contextvars.Context.get
-contextvars.ContextVar.reset
-contextvars.ContextVar.set
 copy.PyStringMap
 dataclasses.Field.__init__
 dataclasses.InitVar.__init__
-dataclasses.dataclass
 dataclasses.field
-dataclasses.replace
 dummy_threading
 email.message.MIMEPart.as_string
 enum.Enum._generate_next_value_
@@ -86,41 +54,27 @@ functools.partialmethod.__get__
 functools.singledispatchmethod.__call__
 gettext.install
 gettext.translation
-hmac.compare_digest
 hmac.new  # Stub is a white lie; see comments in the stub
 http.client.HTTPSConnection.__init__
 http.cookiejar.DefaultCookiePolicy.__init__
 http.server.SimpleHTTPRequestHandler.__init__
-imaplib.IMAP4.__init__
-imaplib.IMAP4.open
-imaplib.IMAP4_SSL.__init__
-imaplib.IMAP4_SSL.open
 importlib.metadata.DistributionFinder.Context.pattern
 importlib.metadata.EntryPointBase
 inspect.isasyncgenfunction
 inspect.iscoroutinefunction
 inspect.isgeneratorfunction
-io.IncrementalNewlineDecoder.setstate
 ipaddress.IPv4Interface.hostmask
 ipaddress.IPv6Interface.hostmask
 ipaddress._BaseNetwork.broadcast_address
 ipaddress._BaseNetwork.hostmask
-itertools.tee
 logging.FileHandler.__init__
 logging.handlers.BaseRotatingHandler.__init__
 logging.handlers.RotatingFileHandler.__init__
 logging.handlers.TimedRotatingFileHandler.__init__
 logging.handlers.WatchedFileHandler.__init__
-lzma.LZMACompressor.compress
-lzma.is_check_supported
-macpath
-macurl2path  # removed in 3.7
-mmap.MADV_AUTOSYNC
-mmap.MADV_CORE
-mmap.MADV_NOCORE
-mmap.MADV_NOSYNC
-mmap.MADV_PROTECT
-mmap.MADV_SOFT_OFFLINE
+macpath  # module removed in 3.8
+macurl2path  # module removed in 3.7
+mmap.MADV_[A-Z_]+  # platform dependent constants
 multiprocessing.managers.SharedMemoryServer.__init__
 multiprocessing.pool.CLOSE
 multiprocessing.pool.RUN
@@ -130,37 +84,15 @@ nntplib.NNTP.starttls
 os.MFD_HUGE_32MB
 os.MFD_HUGE_512MB
 os.getgrouplist
-os.initgroups
-os.pipe2
-os.posix_fadvise
-os.posix_fallocate
-os.sched_getaffinity
-os.sched_getparam
-os.sched_getscheduler
-os.sched_rr_get_interval
-os.sched_setaffinity
-os.sched_setparam
-os.sched_setscheduler
 os.sendfile
-os.setresgid
-os.setresuid
-os.waitid
-pickle.Pickler.dump
 pickle.Pickler.reducer_override
-pickle.loads
 platform.DEV_NULL
 platform.uname_result.__new__
 platform.uname_result._fields
 platform.uname_result.processor
-pwd.getpwnam
-pwd.getpwuid
 queue.SimpleQueue.__init__
-random.SystemRandom.getrandbits
 secrets.SystemRandom.getstate
-secrets.SystemRandom.getrandbits
-secrets.compare_digest
-signal.sigtimedwait
-signal.sigwaitinfo
+select.epoll.register
 smtplib.LMTP.__init__
 smtplib.SMTP.sendmail
 sre_constants.RANGE_IGNORE
@@ -172,13 +104,12 @@ sys.UnraisableHookArgs
 threading.ExceptHookArgs
 time.CLOCK_PROF
 time.CLOCK_UPTIME
-trace.Trace.runfunc
 types.ClassMethodDescriptorType.__get__
 types.CodeType.replace
+types.GenericAlias.__getattr__
 types.MethodDescriptorType.__get__
 types.WrapperDescriptorType.__get__
-typing.Annotated
-typing.NamedTuple
+typing.ForwardRef._evaluate
 typing.SupportsAbs.__init__
 typing.SupportsBytes.__init__
 typing.SupportsComplex.__init__
@@ -195,16 +126,78 @@ typing._TypedDict.pop
 typing._TypedDict.setdefault
 typing._TypedDict.update
 typing._TypedDict.values
-unittest.TestCase.addCleanup
-unittest.case.TestCase.addCleanup
 unittest.doModuleCleanups
-weakref.WeakValueDictionary.__init__
 weakref.WeakValueDictionary.update
-weakref.getweakrefcount
 webbrowser.Opera.raise_opts
-xml.etree.ElementTree.Element.getchildren
-xml.etree.ElementTree.Element.getiterator
-xml.etree.ElementTree.ElementTree.getiterator
 xml.etree.ElementTree.XMLParser.__init__
-xml.etree.cElementTree
+xml.etree.cElementTree.XMLParser.__init__
+
+# positional-only complaints
+builtins.bytearray.pop
+builtins.bytearray.remove
+bz2.BZ2Compressor.compress
+bz2.BZ2File.read
+bz2.BZ2File.read1
+bz2.BZ2File.readline
+bz2.BZ2File.seek
+codecs.lookup
+codecs.lookup_error
+codecs.register
+collections.AsyncGenerator.asend
+collections.AsyncGenerator.athrow
+collections.Container.__contains__
+collections.Coroutine.send
+collections.Coroutine.throw
+collections.Generator.send
+collections.Generator.throw
+collections.OrderedDict.fromkeys
+collections.OrderedDict.setdefault
+collections.abc.AsyncGenerator.asend
+collections.abc.AsyncGenerator.athrow
+collections.abc.Container.__contains__
+collections.abc.Coroutine.send
+collections.abc.Coroutine.throw
+collections.abc.Generator.send
+collections.abc.Generator.throw
+concurrent.futures.Executor.submit
+concurrent.futures.ProcessPoolExecutor.submit
+concurrent.futures.ThreadPoolExecutor.submit
+concurrent.futures._base.Executor.submit
+concurrent.futures.process.ProcessPoolExecutor.submit
+concurrent.futures.thread.ThreadPoolExecutor.submit
+contextlib.AbstractContextManager.__exit__
+contextlib.AsyncExitStack.callback
+contextlib.AsyncExitStack.push_async_callback
+contextlib.ExitStack.callback
+contextvars.ContextVar.reset
+contextvars.ContextVar.set
+dataclasses.dataclass
+dataclasses.replace
+hmac.compare_digest
+io.IncrementalNewlineDecoder.setstate
+itertools.tee
+lzma.LZMACompressor.compress
+lzma.is_check_supported
+os.initgroups
+os.pipe2
+os.posix_fadvise
+os.posix_fallocate
+os.sched_getaffinity
+os.sched_getparam
+os.sched_getscheduler
+os.sched_rr_get_interval
+os.sched_setaffinity
+os.sched_setparam
+os.sched_setscheduler
+os.setresgid
+os.setresuid
+os.waitid
+pwd.getpwnam
+pwd.getpwuid
+random.SystemRandom.getrandbits
+secrets.SystemRandom.getrandbits
+secrets.compare_digest
+signal.sigtimedwait
+signal.sigwaitinfo
+trace.Trace.runfunc
 zipfile.ZipExtFile.seek