diff --git a/core/core.services.yml b/core/core.services.yml
index 3402ad2051..8ee45deb1a 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -829,7 +829,6 @@ services:
     arguments: ['@kernel']
     public: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.0.0 and is removed from drupal:10.0.0. Use the app.root parameter instead. See https://www.drupal.org/node/3080612
-  Drupal\Core\AppRootFactory: '@app.root.factory'
   site.path:
     class: \SplString
     factory: ['@site.path.factory', 'get']
@@ -841,7 +840,6 @@ services:
     arguments: ['@kernel']
     public: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.0.0 and is removed from drupal:10.0.0. Use the site.path parameter instead. See https://www.drupal.org/node/3080612
-  Drupal\Core\SitePathFactory: '@site.path.factory'
   controller_resolver:
     class: Drupal\Core\Controller\ControllerResolver
     arguments: ['@psr7.http_message_factory', '@class_resolver']
@@ -1609,52 +1607,42 @@ services:
     class: Laminas\Feed\Reader\Extension\DublinCore\Entry
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('DublinCore\Entry') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\DublinCore\Entry: '@feed.reader.dublincoreentry'
   feed.reader.dublincorefeed:
     class: Laminas\Feed\Reader\Extension\DublinCore\Feed
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('DublinCore\Feed') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\DublinCore\Feed: '@feed.reader.dublincorefeed'
   feed.reader.contententry:
     class: Laminas\Feed\Reader\Extension\Content\Entry
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('Content\Entry') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\Content\Entry: '@feed.reader.contententry'
   feed.reader.atomentry:
     class: Laminas\Feed\Reader\Extension\Atom\Entry
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('Atom\Entry') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\Atom\Entry: '@feed.reader.atomentry'
   feed.reader.atomfeed:
     class: Laminas\Feed\Reader\Extension\Atom\Feed
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('Atom\Feed') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\Atom\Feed: '@feed.reader.atomfeed'
   feed.reader.slashentry:
     class: Laminas\Feed\Reader\Extension\Slash\Entry
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('Slash\Entry') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\Slash\Entry: '@feed.reader.slashentry'
   feed.reader.wellformedwebentry:
     class: Laminas\Feed\Reader\Extension\WellFormedWeb\Entry
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('WellFormedWeb\Entry') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\WellFormedWeb\Entry: '@feed.reader.wellformedwebentry'
   feed.reader.threadentry:
     class: Laminas\Feed\Reader\Extension\Thread\Entry
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('Thread\Entry') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\Thread\Entry: '@feed.reader.threadentry'
   feed.reader.podcastentry:
     class: Laminas\Feed\Reader\Extension\Podcast\Entry
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('Podcast\Entry') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\Podcast\Entry: '@feed.reader.podcastentry'
   feed.reader.podcastfeed:
     class: Laminas\Feed\Reader\Extension\Podcast\Feed
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('Podcast\Feed') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Reader\Extension\Podcast\Feed: '@feed.reader.podcastfeed'
 
   # Laminas Feed writer plugins. Plugins should be set as prototype scope.
   feed.writer.atomrendererfeed:
@@ -1677,12 +1665,10 @@ services:
     class: Laminas\Feed\Writer\Extension\ITunes\Entry
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.writer')->get('ITunes\Entry') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Writer\Extension\ITunes\Entry: '@feed.writer.itunesentry'
   feed.writer.itunesfeed:
     class: Laminas\Feed\Writer\Extension\ITunes\Feed
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.writer')->get('ITunes\Feed') instead. See https://www.drupal.org/node/2979042
-  Laminas\Feed\Writer\Extension\ITunes\Feed: '@feed.writer.itunesfeed'
   feed.writer.itunesrendererentry:
     class: Laminas\Feed\Writer\Extension\ITunes\Renderer\Entry
     shared: false
diff --git a/core/tests/Drupal/KernelTests/Core/DependencyInjection/AutowireTest.php b/core/tests/Drupal/KernelTests/Core/DependencyInjection/AutowireTest.php
index 93624825f4..0930e0946d 100644
--- a/core/tests/Drupal/KernelTests/Core/DependencyInjection/AutowireTest.php
+++ b/core/tests/Drupal/KernelTests/Core/DependencyInjection/AutowireTest.php
@@ -40,15 +40,15 @@ public function testAutowire(): void {
 
   /**
    * Tests that core services have aliases correctly defined where possible.
-   *
-   * @group legacy
    */
   public function testCoreServiceAliases(): void {
-    $this->expectDeprecation('Drupal\Component\Bridge\ZfExtensionManagerSfContainer is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. The class has moved to \Drupal\aggregator\ZfExtensionManagerSfContainer. See https://www.drupal.org/node/3258656');
-
     $services = [];
     $aliases = [];
     foreach (Yaml::decode(file_get_contents('core/core.services.yml'))['services'] as $id => $service) {
+      if (isset($service['deprecated'])) {
+        continue;
+      }
+
       if (is_string($service)) {
         $aliases[$id] = substr($service, 1);
       }
diff --git a/core/tests/Drupal/KernelTests/Core/LegacyServiceTest.php b/core/tests/Drupal/KernelTests/Core/LegacyServiceTest.php
index 58ce688e7d..c7746997cf 100644
--- a/core/tests/Drupal/KernelTests/Core/LegacyServiceTest.php
+++ b/core/tests/Drupal/KernelTests/Core/LegacyServiceTest.php
@@ -17,7 +17,7 @@ class LegacyServiceTest extends KernelTestBase {
    */
   public function testSitePath() {
     $this->expectDeprecation('The "site.path" service is deprecated in drupal:9.0.0 and is removed from drupal:10.0.0. Use the site.path parameter instead. See https://www.drupal.org/node/3080612');
-    $this->expectDeprecation('The "Drupal\Core\SitePathFactory" service is deprecated in drupal:9.0.0 and is removed from drupal:10.0.0. Use the site.path parameter instead. See https://www.drupal.org/node/3080612');
+    $this->expectDeprecation('The "site.path.factory" service is deprecated in drupal:9.0.0 and is removed from drupal:10.0.0. Use the site.path parameter instead. See https://www.drupal.org/node/3080612');
     $this->assertSame($this->container->get('site.path'), (string) $this->container->getParameter('site.path'));
   }
 
@@ -26,7 +26,7 @@ public function testSitePath() {
    */
   public function testAppRoot() {
     $this->expectDeprecation('The "app.root" service is deprecated in drupal:9.0.0 and is removed from drupal:10.0.0. Use the app.root parameter instead. See https://www.drupal.org/node/3080612');
-    $this->expectDeprecation('The "Drupal\Core\AppRootFactory" service is deprecated in drupal:9.0.0 and is removed from drupal:10.0.0. Use the app.root parameter instead. See https://www.drupal.org/node/3080612');
+    $this->expectDeprecation('The "app.root.factory" service is deprecated in drupal:9.0.0 and is removed from drupal:10.0.0. Use the app.root parameter instead. See https://www.drupal.org/node/3080612');
     $this->assertSame($this->container->get('app.root'), (string) $this->container->getParameter('app.root'));
   }