diff -u b/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php
--- b/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTest.php
@@ -325,7 +325,7 @@
     // Test edit link as accessed from Taxonomy administration pages.
     // Because Simpletest creates its own database when running tests, we know
     // the first edit link found on the listing page is to our term.
-    $this->clickLink(t('Edit'), 1);
+    $this->clickLink(t('Edit'));
 
     $this->assertRaw($edit['name[0][value]'], 'The randomly generated term name is present.');
     $this->assertText($edit['description[0][value]'], 'The randomly generated term description is present.');
diff -u b/core/modules/tracker/src/Tests/TrackerTest.php b/core/modules/tracker/src/Tests/TrackerTest.php
--- b/core/modules/tracker/src/Tests/TrackerTest.php
+++ b/core/modules/tracker/src/Tests/TrackerTest.php
@@ -54,8 +54,8 @@
     $this->user = $this->drupalCreateUser($permissions);
     $this->otherUser = $this->drupalCreateUser($permissions);
     $this->addDefaultCommentField('node', 'page');
-    $this->drupalPlaceBlock('system_page_tabs_block');
-    $this->drupalPlaceBlock('system_page_actions_block');
+    $this->drupalPlaceBlock('system_page_tabs_block', ['id' => 'page_tabs_block']);
+    $this->drupalPlaceBlock('system_page_actions_block', ['id' => 'page_actions_block']);
   }
 
   /**
@@ -81,7 +81,15 @@
     // Assert cache contexts, specifically the pager and node access contexts.
     $this->assertCacheContexts(['languages:language_interface', 'route.name', 'theme', 'url.query_args.pagers:0', 'user.node_grants:view', 'user.permissions']);
     // Assert cache tags for the visible node and node list cache tag.
-    $this->assertCacheTags(Cache::mergeTags($published->getCacheTags(), $published->getOwner()->getCacheTags(), ['node_list', 'rendered']));
+    $additional_cache_tags = [
+      'node_list',
+      'rendered',
+      'block_view',
+      'config:block.block.page_actions_block',
+      'config:block.block.page_tabs_block',
+      'config:block_list',
+    ];
+    $this->assertCacheTags(Cache::mergeTags($published->getCacheTags(), $published->getOwner()->getCacheTags(), $additional_cache_tags));
 
     // Delete a node and ensure it no longer appears on the tracker.
     $published->delete();
@@ -152,7 +160,14 @@
       $my_published->getOwner()->getCacheTags(),
       $other_published_my_comment->getCacheTags(),
       $other_published_my_comment->getOwner()->getCacheTags(),
-      ['node_list', 'rendered']
+      [
+        'node_list',
+        'rendered',
+        'block_view',
+        'config:block.block.page_actions_block',
+        'config:block.block.1page_tabs_block',
+        'config:block_list',
+      ]
     );
     $this->assertCacheTags($tags);
 
only in patch2:
unchanged:
--- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
@@ -75,6 +75,7 @@ function testPageCacheTags() {
       'route.menu_active_trails:footer',
       'route.menu_active_trails:main',
       'route.menu_active_trails:tools',
+      'route.name',
       'theme',
       'timezone',
       'user.permissions',
@@ -97,6 +98,8 @@ function testPageCacheTags() {
       'config:block.block.bartik_main_menu',
       'config:block.block.bartik_account_menu',
       'config:block.block.bartik_messages',
+      'config:block.block.bartik_page_actions',
+      'config:block.block.bartik_page_tabs',
       'node_view',
       'node:' . $node_1->id(),
       'user:' . $author_1->id(),
@@ -129,6 +132,8 @@ function testPageCacheTags() {
       'config:block.block.bartik_main_menu',
       'config:block.block.bartik_account_menu',
       'config:block.block.bartik_messages',
+      'config:block.block.bartik_page_actions',
+      'config:block.block.bartik_page_tabs',
       'node_view',
       'node:' . $node_2->id(),
       'user:' . $author_2->id(),