diff --git a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
index 8a10625049..5533d4b825 100644
--- a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
@@ -55,11 +55,15 @@ protected function setUp(): void {
 
     // This test puts menu links in the Tools menu and then tests for their
     // presence on the page, so we need to ensure that the Tools block will be
-    // displayed in the admin theme.
+    // displayed in the admin theme and olivero.
     $this->drupalPlaceBlock('system_menu_block:tools', [
       'region' => 'content',
       'theme' => $this->config('system.theme')->get('admin'),
     ]);
+    $this->drupalPlaceBlock('system_menu_block:tools', [
+      'region' => 'content',
+      'theme' => 'olivero',
+    ]);
   }
 
   /**
@@ -298,8 +302,8 @@ public function testBreadCrumbs() {
       // untranslated menu links automatically generated from menu router items
       // ('taxonomy/term/%') should never be translated and appear in any menu
       // other than the breadcrumb trail.
-      $elements = $this->xpath('//nav[@id=:menu]/descendant::a[@href=:href]', [
-        ':menu' => 'block-bartik-tools',
+      $elements = $this->xpath('//nav[contains(@class, :menu-class)]/descendant::a[@href=:href]', [
+        ':menu-class' => 'menu--tools',
         ':href' => Url::fromUri('base:' . $link_path)->toString(),
       ]);
       $this->assertCount(1, $elements, "Link to {$link_path} appears only once.");