diff --git a/core/modules/menu_ui/tests/src/Functional/MenuTest.php b/core/modules/menu_ui/tests/src/Functional/MenuTest.php
index 398aa9e613..308eb67b69 100644
--- a/core/modules/menu_ui/tests/src/Functional/MenuTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuTest.php
@@ -5,6 +5,7 @@
 use Drupal\block\Entity\Block;
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Unicode;
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Menu\MenuLinkInterface;
 use Drupal\Core\Url;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
@@ -557,7 +558,7 @@ public function testUnpublishedNodeMenuItem() {
     $this->assertNoText($item->getTitle(), "Menu link pointing to unpublished node is only visible to users with 'bypass node access' permission");
     // The cache contexts associated with the (in)accessible menu links are
     // bubbled. See DefaultMenuLinkTreeManipulators::menuLinkCheckAccess().
-    $this->assertCacheContext('user.permissions');
+    $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Contexts', 'user.permissions');
   }
 
   /**
@@ -867,13 +868,13 @@ public function testMenuParentsJsAccess() {
     $admin = $this->drupalCreateUser(['administer menu']);
     $this->drupalLogin($admin);
     // Just check access to the callback overall, the POST data is irrelevant.
-    $this->drupalGetAjax('admin/structure/menu/parents');
+    $this->drupalGet('admin/structure/menu/parents', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']], ['X-Requested-With: XMLHttpRequest']);
     $this->assertResponse(200);
 
     // Do standard user tests.
     // Log in the user.
     $this->drupalLogin($this->authenticatedUser);
-    $this->drupalGetAjax('admin/structure/menu/parents');
+    $this->drupalGet('admin/structure/menu/parents', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']], ['X-Requested-With: XMLHttpRequest']);
     $this->assertResponse(403);
   }