diff --git a/stubs/pkg_resources/METADATA.toml b/stubs/pkg_resources/METADATA.toml
deleted file mode 100644
index 5f1541084942..000000000000
--- a/stubs/pkg_resources/METADATA.toml
+++ /dev/null
@@ -1 +0,0 @@
-version = "0.1"
diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt
new file mode 100644
index 000000000000..e06f40603b47
--- /dev/null
+++ b/stubs/setuptools/@tests/stubtest_allowlist.txt
@@ -0,0 +1,28 @@
+pkg_resources.Distribution.__cmp__
+pkg_resources.Distribution.activate
+pkg_resources.Distribution.get_entry_map
+pkg_resources.EggMetadata.__init__
+pkg_resources.EggProvider.__init__
+pkg_resources.Environment.best_match
+pkg_resources.Environment.obtain
+pkg_resources.FileMetadata.__init__
+pkg_resources.IMetadataProvider.get_metadata
+pkg_resources.IMetadataProvider.get_metadata_lines
+pkg_resources.IMetadataProvider.has_metadata
+pkg_resources.IMetadataProvider.metadata_isdir
+pkg_resources.IMetadataProvider.metadata_listdir
+pkg_resources.IMetadataProvider.run_script
+pkg_resources.IResourceManager
+pkg_resources.NullProvider.__init__
+pkg_resources.Requirement.__init__
+pkg_resources.WorkingSet.find_plugins
+pkg_resources.WorkingSet.resolve
+pkg_resources.WorkingSet.subscribe
+pkg_resources.ZipProvider.__init__
+pkg_resources.declare_namespace
+pkg_resources.fixup_namespace_packages
+pkg_resources.get_entry_map
+pkg_resources.get_provider
+pkg_resources.py31compat
+pkg_resources.split_sections
+pkg_resources.to_filename
diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml
new file mode 100644
index 000000000000..85af15d9cae5
--- /dev/null
+++ b/stubs/setuptools/METADATA.toml
@@ -0,0 +1 @@
+version = "57.0"
diff --git a/stubs/pkg_resources/pkg_resources/__init__.pyi b/stubs/setuptools/pkg_resources/__init__.pyi
similarity index 100%
rename from stubs/pkg_resources/pkg_resources/__init__.pyi
rename to stubs/setuptools/pkg_resources/__init__.pyi
diff --git a/stubs/pkg_resources/pkg_resources/py31compat.pyi b/stubs/setuptools/pkg_resources/py31compat.pyi
similarity index 100%
rename from stubs/pkg_resources/pkg_resources/py31compat.pyi
rename to stubs/setuptools/pkg_resources/py31compat.pyi
diff --git a/tests/stubtest_third_party.py b/tests/stubtest_third_party.py
index dcf20c8935d8..c60c92ac5dd1 100755
--- a/tests/stubtest_third_party.py
+++ b/tests/stubtest_third_party.py
@@ -16,7 +16,6 @@
     "Flask",  # fails when stubtest tries to stringify some object
     "pyaudio",  # install failure locally
     "backports",  # errors on python version
-    "pkg_resources",  # ???
     "six",  # ???
     "aiofiles",  # easily fixable, some platform specific difference between local and ci
     "pycurl"  # install failure, missing libcurl