diff --git a/src/flake8/plugins/finder.py b/src/flake8/plugins/finder.py
index 43b5417..3731db9 100644
--- a/src/flake8/plugins/finder.py
+++ b/src/flake8/plugins/finder.py
@@ -162,12 +162,11 @@ def _flake8_plugins(
 
         if ep.name == "F":
             yield Plugin(pyflakes_meta["name"], pyflakes_meta["version"], ep)
-        elif ep.name.startswith("pycodestyle"):
+        elif ep.name in "EW":
             # pycodestyle provides both `E` and `W` -- but our default select
             # handles those
             # ideally pycodestyle's plugin entrypoints would exactly represent
             # the codes they produce...
-            ep = importlib_metadata.EntryPoint("E", ep.value, ep.group)
             yield Plugin(
                 pycodestyle_meta["name"], pycodestyle_meta["version"], ep
             )
diff --git a/tests/unit/plugins/finder_test.py b/tests/unit/plugins/finder_test.py
index 15f15a2..e1ab858 100644
--- a/tests/unit/plugins/finder_test.py
+++ b/tests/unit/plugins/finder_test.py
@@ -118,8 +118,8 @@ flake8 = flake8.main.cli:main
 
 [flake8.extension]
 F = flake8.plugins.pyflakes:FlakesChecker
-pycodestyle.bare_except = pycodestyle:bare_except
-pycodestyle.blank_lines = pycodestyle:blank_lines
+E = flake8.plugins.pycodestyle:pycodestyle_logical
+W = flake8.plugins.pycodestyle:pycodestyle_physical
 
 [flake8.report]
 default = flake8.formatting.default:Default
@@ -181,7 +181,7 @@ def test_flake8_plugins(flake8_dist, mock_distribution):
             "9000.2.0",
             importlib_metadata.EntryPoint(
                 "E",
-                "pycodestyle:bare_except",
+                "flake8.plugins.pycodestyle:pycodestyle_logical",
                 "flake8.extension",
             ),
         ),
@@ -189,8 +189,8 @@ def test_flake8_plugins(flake8_dist, mock_distribution):
             "pycodestyle",
             "9000.2.0",
             importlib_metadata.EntryPoint(
-                "E",
-                "pycodestyle:blank_lines",
+                "W",
+                "flake8.plugins.pycodestyle:pycodestyle_physical",
                 "flake8.extension",
             ),
         ),
@@ -276,7 +276,7 @@ unrelated = unrelated:main
             "9000.2.0",
             importlib_metadata.EntryPoint(
                 "E",
-                "pycodestyle:bare_except",
+                "flake8.plugins.pycodestyle:pycodestyle_logical",
                 "flake8.extension",
             ),
         ),
@@ -284,8 +284,8 @@ unrelated = unrelated:main
             "pycodestyle",
             "9000.2.0",
             importlib_metadata.EntryPoint(
-                "E",
-                "pycodestyle:blank_lines",
+                "W",
+                "flake8.plugins.pycodestyle:pycodestyle_physical",
                 "flake8.extension",
             ),
         ),
@@ -512,7 +512,7 @@ def test_find_plugins(
             "9000.2.0",
             importlib_metadata.EntryPoint(
                 "E",
-                "pycodestyle:bare_except",
+                "flake8.plugins.pycodestyle:pycodestyle_logical",
                 "flake8.extension",
             ),
         ),
@@ -520,8 +520,8 @@ def test_find_plugins(
             "pycodestyle",
             "9000.2.0",
             importlib_metadata.EntryPoint(
-                "E",
-                "pycodestyle:blank_lines",
+                "W",
+                "flake8.plugins.pycodestyle:pycodestyle_physical",
                 "flake8.extension",
             ),
         ),