diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
index f710f92313..f3451a896d 100644
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
@@ -30,7 +30,7 @@ class LayoutBuilderTest extends JavascriptTestBase {
   public static $modules = [
     'block_content',
     'field_ui',
-    'layout',
+    'layout_builder',
     'layout_test',
     'node',
   ];
@@ -89,6 +89,8 @@ protected function setUp() {
    * Tests the Layout Builder UI.
    */
   public function testLayoutBuilderUi() {
+    $layout_url = $this->node->toUrl()->setAbsolute()->toString() . '/layout';
+
     $assert_session = $this->assertSession();
     $page = $this->getSession()->getPage();
 
@@ -133,8 +135,7 @@ public function testLayoutBuilderUi() {
     $page->pressButton('Add Block');
     $assert_session->assertWaitOnAjaxRequest();
     $assert_session->elementNotExists('css', '#drupal-off-canvas');
-
-    $assert_session->addressEquals($this->node->toUrl('layout-builder'));
+    $assert_session->addressEquals($layout_url);
     $assert_session->pageTextContains('Powered by Drupal');
     $assert_session->pageTextContains('This is the label');
     $this->assertPageNotReloaded();
@@ -144,7 +145,7 @@ public function testLayoutBuilderUi() {
     $assert_session->pageTextNotContains('Powered by Drupal');
 
     // When returning to the layout edit mode, the new block is visible.
-    $this->drupalGet($this->node->toUrl('layout-builder'));
+    $this->drupalGet($layout_url);
     $assert_session->pageTextContains('Powered by Drupal');
 
     // Save the layout, and the new block is visible.
@@ -156,7 +157,7 @@ public function testLayoutBuilderUi() {
     $assert_session->elementExists('css', '.layout');
 
     // Drag one block from one region to another.
-    $this->drupalGet($this->node->toUrl('layout-builder'));
+    $this->drupalGet($layout_url);
     $this->markCurrentPage();
 
     $assert_session->linkExists('Add Section');
@@ -178,7 +179,7 @@ public function testLayoutBuilderUi() {
     $this->assertPageNotReloaded();
 
     // Ensure the drag persisted after reload.
-    $this->drupalGet($this->node->toUrl('layout-builder'));
+    $this->drupalGet($layout_url);
     $assert_session->elementExists('css', '.layout__region--second .block-system-powered-by-block');
     $assert_session->elementTextContains('css', '.layout__region--second', 'Powered by Drupal');
 
@@ -189,7 +190,7 @@ public function testLayoutBuilderUi() {
     $assert_session->elementTextContains('css', '.layout__region--second', 'Powered by Drupal');
 
     // Configure a block.
-    $this->drupalGet($this->node->toUrl('layout-builder'));
+    $this->drupalGet($layout_url);
     $this->markCurrentPage();
 
     $this->clickContextualLink('.block-system-powered-by-block', 'Configure');
@@ -200,7 +201,7 @@ public function testLayoutBuilderUi() {
     $assert_session->assertWaitOnAjaxRequest();
     $assert_session->elementNotExists('css', '#drupal-off-canvas');
 
-    $assert_session->addressEquals($this->node->toUrl('layout-builder'));
+    $assert_session->addressEquals($layout_url);
     $assert_session->pageTextContains('Powered by Drupal');
     $assert_session->pageTextContains('This is the new label');
     $assert_session->pageTextNotContains('This is the label');
@@ -215,7 +216,7 @@ public function testLayoutBuilderUi() {
 
     $assert_session->pageTextNotContains('Powered by Drupal');
     $assert_session->linkExists('Add Block');
-    $assert_session->addressEquals($this->node->toUrl('layout-builder'));
+    $assert_session->addressEquals($layout_url);
     $this->assertPageNotReloaded();
 
     $assert_session->linkExists('Save Layout');
@@ -223,7 +224,7 @@ public function testLayoutBuilderUi() {
     $assert_session->elementExists('css', '.layout');
 
     // Test deriver-based blocks.
-    $this->drupalGet($this->node->toUrl('layout-builder'));
+    $this->drupalGet($layout_url);
     $this->markCurrentPage();
 
     $assert_session->linkExists('Add Block');
@@ -267,6 +268,8 @@ public function testLayoutBuilderUi() {
    * Tests configurable layouts.
    */
   public function testConfigurableLayouts() {
+    $layout_url = $this->node->toUrl()->setAbsolute()->toString() . '/layout';
+
     \Drupal::entityTypeManager()
       ->getStorage('entity_view_display')
       ->create([
@@ -281,7 +284,7 @@ public function testConfigurableLayouts() {
     $assert_session = $this->assertSession();
     $page = $this->getSession()->getPage();
 
-    $this->drupalGet($this->node->toUrl('layout-builder'));
+    $this->drupalGet($layout_url);
     $this->markCurrentPage();
 
     $assert_session->linkExists('Add Section');
@@ -326,6 +329,8 @@ public function testConfigurableLayouts() {
    * Tests bypassing the Off Canvas dialog.
    */
   public function testLayoutNoDialog() {
+    $layout_url = $this->node->toUrl()->setAbsolute()->toString() . '/layout';
+
     \Drupal::entityTypeManager()
       ->getStorage('entity_view_display')
       ->create([
@@ -343,7 +348,7 @@ public function testLayoutNoDialog() {
     // Set up a layout with one section.
     $this->drupalGet(Url::fromRoute('layout_builder.choose_section', [
       'section_storage_type' => 'overrides',
-      'section_storage' => 'node:1',
+      'section_storage' => 'node.1',
       'delta' => 0,
     ]));
     $assert_session->linkExists('One column');
@@ -352,7 +357,7 @@ public function testLayoutNoDialog() {
     // Add a block.
     $this->drupalGet(Url::fromRoute('layout_builder.add_block', [
       'section_storage_type' => 'overrides',
-      'section_storage' => 'node:1',
+      'section_storage' => 'node.1',
       'delta' => 0,
       'region' => 'content',
       'plugin_id' => 'system_powered_by_block',
@@ -362,18 +367,18 @@ public function testLayoutNoDialog() {
     $page->fillField('settings[label_display]', TRUE);
     $page->pressButton('Add Block');
 
-    $assert_session->addressEquals($this->node->toUrl('layout-builder'));
+    $assert_session->addressEquals($layout_url);
     $assert_session->pageTextContains('Powered by Drupal');
     $assert_session->pageTextContains('The block label');
 
     // Remove the section.
     $this->drupalGet(Url::fromRoute('layout_builder.remove_section', [
       'section_storage_type' => 'overrides',
-      'section_storage' => 'node:1',
+      'section_storage' => 'node.1',
       'delta' => 0,
     ]));
     $page->pressButton('Remove');
-    $assert_session->addressEquals($this->node->toUrl('layout-builder'));
+    $assert_session->addressEquals($layout_url);
     $assert_session->pageTextNotContains('Powered by Drupal');
     $assert_session->pageTextNotContains('The block label');
     $assert_session->linkNotExists('Add Block');