diff --git a/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php b/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
index 47bcde424b..74bea2b69b 100644
--- a/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
+++ b/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
@@ -661,7 +661,7 @@ public function testConcurrentEditing() {
     $assert_session->elementExists('css', '.layout--twocol-section');
     $assert_session->pageTextContains('You have unsaved changes.');
     $assert_session->buttonExists('Save layout');
-    $assert_session->linkExists('Discard changes');
+    $assert_session->buttonExists('Discard changes');
 
     $this->drupalLogin($user2);
     $this->drupalGet('admin/structure/types/manage/bundle_with_section_field/display/default/layout');
@@ -669,7 +669,7 @@ public function testConcurrentEditing() {
     $assert_session->pageTextContains(sprintf('This layout is being edited by user %s, and is therefore locked from editing by others.', $user1->getDisplayName()));
     $assert_session->pageTextNotContains('You have unsaved changes.');
     $assert_session->buttonNotExists('Save layout');
-    $assert_session->linkNotExists('Discard changes');
+    $assert_session->buttonNotExists('Discard changes');
 
     $page->clickLink('break this lock');
     $page->pressButton('Confirm');
@@ -679,7 +679,7 @@ public function testConcurrentEditing() {
     $assert_session->pageTextNotContains('You have unsaved changes.');
     $assert_session->pageTextContains('The changes to the layout have been discarded.');
     $assert_session->buttonExists('Save layout');
-    $assert_session->linkExists('Discard changes');
+    $assert_session->buttonExists('Discard changes');
   }
 
   /**
diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
index f1c2b67fb2..8afd05b5d8 100644
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
@@ -542,7 +542,7 @@ public function testAddInlineBlocksPermission() {
    * Tests 'create and edit custom blocks' permission to edit an existing block.
    */
   public function testEditInlineBlocksPermission() {
-    $assert_session = $this->assertSession();
+    $page = $this->getSession()->getPage();
 
     LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
       ->enableLayoutBuilder()
@@ -557,6 +557,7 @@ public function testEditInlineBlocksPermission() {
     ]));
     $this->drupalGet(static::FIELD_UI_PREFIX . '/display/default/layout');
     $this->addInlineBlockToLayout('The block label', 'The body value');
+    $page->pressButton('Save layout');
 
     $assert = function ($permissions, $expected) {
       $assert_session = $this->assertSession();