diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
index dc4e6887c5..43c2680585 100644
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
@@ -4,14 +4,14 @@
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 
 /**
  * Tests the Layout Builder UI Javascript functionality.
  *
  * @group layout_builder
  */
-class LayoutBuilderTest extends JavascriptTestBase {
+class LayoutBuilderTest extends WebDriverTestBase {
 
   /**
    * {@inheritdoc}
@@ -84,10 +84,14 @@ public function testFormsLinksDisabled() {
 
     $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field';
 
+    $this->drupalPostForm("$field_ui_prefix/display", ['layout[enabled]' => TRUE], 'Save');
+    $assert_session->linkExists('Manage layout');
+    $this->clickLink('Manage layout');
+
     $this->drupalGet("$field_ui_prefix/display-layout/default");
 
     // Add a block with a link and one with a form.
-    $this->addBlock('Block with link', '.block-field-blockblock-contentbasicbody');
+    $this->addBlock('Block with link', '.block-block-content');
     $this->addBlock('Search form', '.search-block-form');
 
     // Ensure the links and forms are disable using the defaults.