diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml
index 3109e9e..d4cf78c 100644
--- a/core/modules/aggregator/aggregator.routing.yml
+++ b/core/modules/aggregator/aggregator.routing.yml
@@ -49,34 +49,6 @@ aggregator.feed_add:
   options:
     _admin_route: TRUE
 
-entity.aggregator_feed.canonical:
-  path: '/aggregator/sources/{aggregator_feed}'
-  defaults:
-    _entity_view: 'aggregator_feed'
-    _title_callback: '\Drupal\aggregator\Controller\AggregatorController::feedTitle'
-  requirements:
-    _permission: 'access news feeds'
-
-entity.aggregator_feed.edit_form:
-  path: '/aggregator/sources/{aggregator_feed}/configure'
-  defaults:
-    _entity_form: 'aggregator_feed.default'
-    _title: 'Configure'
-  requirements:
-    _permission: 'administer news feeds'
-  options:
-    _admin_route: TRUE
-
-entity.aggregator_feed.delete_form:
-  path: '/aggregator/sources/{aggregator_feed}/delete'
-  defaults:
-    _entity_form: 'aggregator_feed.delete'
-    _title: 'Delete feed'
-  requirements:
-    _permission: 'administer news feeds'
-  options:
-    _admin_route: TRUE
-
 aggregator.page_last:
   path: '/aggregator'
   defaults:
diff --git a/core/modules/aggregator/src/FeedHtmlRouteProvider.php b/core/modules/aggregator/src/FeedHtmlRouteProvider.php
index 33cff3b..67e2779 100644
--- a/core/modules/aggregator/src/FeedHtmlRouteProvider.php
+++ b/core/modules/aggregator/src/FeedHtmlRouteProvider.php
@@ -25,6 +25,9 @@ public function getRoutes(EntityTypeInterface $entity_type) {
       ->setDefault('_title', 'Configure')
       ->setOption('_admin_route', TRUE);
 
+    $collection->get('entity.aggregator_feed.delete_form')
+      ->setOption('_admin_route', TRUE);
+
     return $collection;
   }
 
diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml
index 794cd6b..04bfa91 100644
--- a/core/modules/comment/comment.routing.yml
+++ b/core/modules/comment/comment.routing.yml
@@ -64,16 +64,6 @@ entity.comment_type.collection:
   options:
     _admin_route: TRUE
 
-entity.comment_type.delete_form:
-  path: '/admin/structure/comment/manage/{comment_type}/delete'
-  defaults:
-    _entity_form: 'comment_type.delete'
-    _title: 'Delete'
-  requirements:
-    _entity_access: 'comment_type.delete'
-  options:
-    _admin_route: TRUE
-
 entity.comment_type.add_form:
   path: '/admin/structure/comment/types/add'
   defaults:
@@ -83,13 +73,3 @@ entity.comment_type.add_form:
     _permission: 'administer comment types'
   options:
     _admin_route: TRUE
-
-entity.comment_type.edit_form:
-  path: '/admin/structure/comment/manage/{comment_type}'
-  defaults:
-    _entity_form: 'comment_type.edit'
-    _title: 'Edit'
-  requirements:
-    _entity_access: 'comment_type.update'
-  options:
-    _admin_route: TRUE
diff --git a/core/modules/file/src/Tests/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php
index dd469af..032a3d4 100644
--- a/core/modules/file/src/Tests/SaveUploadTest.php
+++ b/core/modules/file/src/Tests/SaveUploadTest.php
@@ -69,7 +69,7 @@ protected function setUp() {
   /**
    * Test the file_save_upload() function.
    */
-  function ptestNormal() {
+  function testNormal() {
     $max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {file_managed}')->fetchField();
     $this->assertTrue($max_fid_after > $this->maxFidBefore, 'A new file was created.');
     $file1 = file_load($max_fid_after);
diff --git a/core/modules/rest/src/Routing/ResourceRoutes.php b/core/modules/rest/src/Routing/ResourceRoutes.php
index ba21a81..050a2b0 100644
--- a/core/modules/rest/src/Routing/ResourceRoutes.php
+++ b/core/modules/rest/src/Routing/ResourceRoutes.php
@@ -59,16 +59,6 @@ public function __construct(ResourcePluginManager $manager, ConfigFactoryInterfa
   }
 
   /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    $events = parent::getSubscribedEvents();
-
-    return $events;
-  }
-
-
-  /**
    * Alters existing routes for a specific collection.
    *
    * @param \Symfony\Component\Routing\RouteCollection $collection
diff --git a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
index d11348b..aa71350 100644
--- a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
@@ -136,7 +136,7 @@ public function testShortcutLinkRename() {
 
     $shortcuts = $set->getShortcuts();
     $shortcut = reset($shortcuts);
-    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id() . '/edit', array('title[0][value]' => $new_link_name, 'path' => $shortcut->path->value), t('Save'));
+    $this->drupalPostForm($shortcut->url('edit-form'), array('title[0][value]' => $new_link_name, 'path' => $shortcut->path->value), t('Save'));
     $saved_set = ShortcutSet::load($set->id());
     $titles = $this->getShortcutInformation($saved_set, 'title');
     $this->assertTrue(in_array($new_link_name, $titles), 'Shortcut renamed: ' . $new_link_name);
@@ -154,7 +154,7 @@ public function testShortcutLinkChangePath() {
 
     $shortcuts = $set->getShortcuts();
     $shortcut = reset($shortcuts);
-    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id() . '/edit', array('title[0][value]' => $shortcut->getTitle(), 'path' => $new_link_path), t('Save'));
+    $this->drupalPostForm($shortcut->url('edit-form'), array('title[0][value]' => $shortcut->getTitle(), 'path' => $new_link_path), t('Save'));
     $saved_set = ShortcutSet::load($set->id());
     $routes = $this->getShortcutInformation($saved_set, 'route_name');
     $this->assertTrue(in_array('system.admin_config', $routes), 'Shortcut path changed: ' . $new_link_path);
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
index ca32b8c..1f70d97 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
@@ -38,9 +38,6 @@
  *     "edit-form" = "/entity_test_base_field_display/manage/{entity_test_base_field_display}",
  *     "delete-form" = "/entity_test/delete/entity_test_base_field_display/{entity_test_base_field_display}",
  *   },
- *   links = {
- *     "edit-form" = "/entity_test_base_field_display/manage/{entity_test_base_field_display}",
- *   },
  *   field_ui_base_route = "entity.entity_test_base_field_display.admin_form",
  * )
  */