diff --git a/core/lib/Drupal/Core/Path/PathAliasStorage.php b/core/lib/Drupal/Core/Path/PathAliasStorage.php
index 92f5ca92fc..f3153bc6fb 100644
--- a/core/lib/Drupal/Core/Path/PathAliasStorage.php
+++ b/core/lib/Drupal/Core/Path/PathAliasStorage.php
@@ -36,7 +36,7 @@ protected function invokeHook($hook, EntityInterface $entity) {
         ];
       }
 
-      $this->moduleHandler()->invokeAllDeprecated("Use hook_ENTITY_TYPE_{$hook}() for the 'path_alias' entity type instead. See https://www.drupal.org/node/3013865.", 'path_' . $hook, [$values]);
+      $this->moduleHandler()->invokeAllDeprecated("It will be removed before Drupal 9.0.0. Use hook_ENTITY_TYPE_{$hook}() for the 'path_alias' entity type instead. See https://www.drupal.org/node/3013865.", 'path_' . $hook, [$values]);
     }
   }
 
diff --git a/core/modules/rest/tests/src/Functional/Update/EntityResourcePermissionsUpdateTest.php b/core/modules/rest/tests/src/Functional/Update/EntityResourcePermissionsUpdateTest.php
index 4601f3eea7..e2b322ac5d 100644
--- a/core/modules/rest/tests/src/Functional/Update/EntityResourcePermissionsUpdateTest.php
+++ b/core/modules/rest/tests/src/Functional/Update/EntityResourcePermissionsUpdateTest.php
@@ -42,7 +42,7 @@ public function testBcEntityResourcePermissionSettingAdded() {
     // permissions include generated URLs inside their description, thus
     // requiring the path alias system, which is not guaranteed to be working
     // before running the database updates.
-    $rest_permissions_callback = \Drupal::service('controller_resolver')->getControllerFromDefinition(RestPermissions::class .'::permissions');
+    $rest_permissions_callback = \Drupal::service('controller_resolver')->getControllerFromDefinition(RestPermissions::class . '::permissions');
     $rest_permissions = array_keys(call_user_func($rest_permissions_callback));
     $this->assertEquals([], $rest_permissions);
 
@@ -53,7 +53,7 @@ public function testBcEntityResourcePermissionSettingAdded() {
     $this->assertTrue(array_key_exists('bc_entity_resource_permissions', $rest_settings->getRawData()));
     $this->assertTrue($rest_settings->get('bc_entity_resource_permissions'));
 
-    $rest_permissions_callback = \Drupal::service('controller_resolver')->getControllerFromDefinition(RestPermissions::class .'::permissions');
+    $rest_permissions_callback = \Drupal::service('controller_resolver')->getControllerFromDefinition(RestPermissions::class . '::permissions');
     $rest_permissions = array_keys(call_user_func($rest_permissions_callback));
     $this->assertEquals(['restful get entity:node', 'restful post entity:node', 'restful delete entity:node', 'restful patch entity:node'], $rest_permissions);
   }
diff --git a/core/modules/system/tests/src/Kernel/DeprecatedPathHooksTest.php b/core/modules/system/tests/src/Kernel/DeprecatedPathHooksTest.php
index 2919980e8c..30bb335494 100644
--- a/core/modules/system/tests/src/Kernel/DeprecatedPathHooksTest.php
+++ b/core/modules/system/tests/src/Kernel/DeprecatedPathHooksTest.php
@@ -30,7 +30,7 @@ protected function setUp() {
   /**
    * @covers ::save
    *
-   * @expectedDeprecation The deprecated hook hook_path_insert() is implemented in these functions: path_deprecated_test_path_insert(). Use hook_ENTITY_TYPE_insert() for the 'path_alias' entity type instead. See https://www.drupal.org/node/3013865.
+   * @expectedDeprecation The deprecated hook hook_path_insert() is implemented in these functions: path_deprecated_test_path_insert(). It will be removed before Drupal 9.0.0. Use hook_ENTITY_TYPE_insert() for the 'path_alias' entity type instead. See https://www.drupal.org/node/3013865.
    */
   public function testInsert() {
     $source = '/' . $this->randomMachineName();
@@ -43,7 +43,7 @@ public function testInsert() {
   /**
    * @covers ::save
    *
-   * @expectedDeprecation The deprecated hook hook_path_update() is implemented in these functions: path_deprecated_test_path_update(). Use hook_ENTITY_TYPE_update() for the 'path_alias' entity type instead. See https://www.drupal.org/node/3013865.
+   * @expectedDeprecation The deprecated hook hook_path_update() is implemented in these functions: path_deprecated_test_path_update(). It will be removed before Drupal 9.0.0. Use hook_ENTITY_TYPE_update() for the 'path_alias' entity type instead. See https://www.drupal.org/node/3013865.
    */
   public function testUpdate() {
     $source = '/' . $this->randomMachineName();
@@ -60,7 +60,7 @@ public function testUpdate() {
   /**
    * @covers ::delete
    *
-   * @expectedDeprecation The deprecated hook hook_path_delete() is implemented in these functions: path_deprecated_test_path_delete(). Use hook_ENTITY_TYPE_delete() for the 'path_alias' entity type instead. See https://www.drupal.org/node/3013865.
+   * @expectedDeprecation The deprecated hook hook_path_delete() is implemented in these functions: path_deprecated_test_path_delete(). It will be removed before Drupal 9.0.0. Use hook_ENTITY_TYPE_delete() for the 'path_alias' entity type instead. See https://www.drupal.org/node/3013865.
    */
   public function testDelete() {
     $source = '/' . $this->randomMachineName();