diff --git a/src/Plugin/Derivative/RevisionsOverviewDeriver.php b/src/Plugin/Derivative/RevisionsOverviewDeriver.php
index b7e308bfc2f0e17e72709499f9feb2cfe51cd285..e6d4d6823830cff2b6cb1cd6cedbbb9f6410cdfd 100644
--- a/src/Plugin/Derivative/RevisionsOverviewDeriver.php
+++ b/src/Plugin/Derivative/RevisionsOverviewDeriver.php
@@ -61,7 +61,7 @@ class RevisionsOverviewDeriver extends DeriverBase implements ContainerDeriverIn
       $this->derivatives[$entity_type_id] = [
         'route_name' => "entity.$entity_type_id.version_history",
         'title' => 'Revisions',
-        'base_route' => "entity.$entity_type_id.edit_form",
+        'base_route' => "entity.$entity_type_id.canonical",
         'weight' => 20,
       ] + $base_plugin_definition;
     }
diff --git a/tests/modules/entity_module_test/entity_module_test.links.task.yml b/tests/modules/entity_module_test/entity_module_test.links.task.yml
index f680bb62d09780c4184f91366e2cc1d47da1c6ba..e306c10c988ed438f88dafb0e5aad85c77087c3f 100644
--- a/tests/modules/entity_module_test/entity_module_test.links.task.yml
+++ b/tests/modules/entity_module_test/entity_module_test.links.task.yml
@@ -1,9 +1,9 @@
-entity.entity_module_test.canonical:
+entity.entity_test_enhanced.canonical:
   title: View
-  route_name: entity.entity_module_test.canonical
-  base_route: entity.entity_module_test.canonical
+  route_name: entity.entity_test_enhanced.canonical
+  base_route: entity.entity_test_enhanced.canonical
 
 entity.entity_module_test.edit_form:
   title: Edit
-  route_name: entity.entity_module_test.edit_form
-  base_route: entity.entity_module_test.canonical
+  route_name: entity.entity_test_enhanced.edit_form
+  base_route: entity.entity_test_enhanced.canonical
diff --git a/tests/src/Functional/RevisionRouteAccessTest.php b/tests/src/Functional/RevisionRouteAccessTest.php
index 42c58401ed5f415175055e25cd7e343147bae150..8eddca4914a06843d2bca02a9a22065f7ae9446c 100644
--- a/tests/src/Functional/RevisionRouteAccessTest.php
+++ b/tests/src/Functional/RevisionRouteAccessTest.php
@@ -82,6 +82,9 @@ class RevisionRouteAccessTest extends BrowserTestBase {
     $edit_link = $this->getSession()->getPage()->findLink('Edit');
     $edit_link->click();
     $this->assertSession()->addressEquals('/entity_test_enhanced/1/edit');
+    // Check if we have revision tab link on edit page.
+    $this->getSession()->getPage()->findLink('Revisions')->click();
+    $this->assertSession()->addressEquals('/entity_test_enhanced/1/revisions');
     $this->drupalGet('/entity_test_enhanced/1/revisions/2/view');
     $this->assertSession()->statusCodeEquals(200);
     $this->assertSession()->responseContains('rev 2');