diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 7628ad30879d8ebc38ae8bb6255a4e093578d375..11f064e8d96647bbf34cbde59d00dd651960c0f2 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -447,26 +447,26 @@ class WcmsTestsBlocksListingsCest {
 
       // Navigate to layout builder.
       $i->amOnPage('/testpage/layout');
-      $i->waitforText('Edit layout for testpage', 30);
+      $i->waitforText('Edit layout for testpage');
 
       // Add an automatic list block.
       $i->click('Add block');
-      $i->waitForText('Choose a block', 30);
+      $i->waitForText('Choose a block');
       $i->click('Automatic list');
-      $i->waitForText('Configure block', 30);
+      $i->waitForText('Configure block');
       $i->fillField('input[name="settings[label]"]', 'title');
       $i->selectOption('settings[content_type]', $content_type);
 
       // Create a block id and add the block.
       $i->fillField('input[name="settings[layout_builder_id]"]', 'automatic' . $machine_name);
       $i->click('Add block');
-      $i->waitForElement('.uw-admin-label', 30);
+      $i->waitForElement('.uw-admin-label');
 
       // Add an manual list block.
       $i->click('Add block');
-      $i->waitForText('Choose a block', 30);
+      $i->waitForText('Choose a block');
       $i->click('Manual list');
-      $i->waitForText('Configure block', 30);
+      $i->waitForText('Configure block');
       $i->fillField('input[name="settings[label]"]', 'title');
       $i->selectOption('settings[content_type]', $content_type);
       $i->fillField('input[name="settings[' . $machine_name . '][items_fieldset][' . $machine_name . '_ids][0][id]"]', 'test' . $machine_name);
@@ -474,12 +474,12 @@ class WcmsTestsBlocksListingsCest {
       // Create a block id and add the block.
       $i->fillField('input[name="settings[layout_builder_id]"]', 'manual' . $machine_name);
       $i->click('Add block');
-      $i->waitForText('Edit layout for testpage', 30);
+      $i->waitForText('Edit layout for testpage');
 
       // Save the layout.
       $i->scrollTo(['css' => 'input[value="Save layout"]'], 100, 0);
       $i->click('Save layout');
-      $i->waitForText('The layout override has been saved.', 30);
+      $i->waitForText('The layout override has been saved.');
 
       // Create a reference image using the automatic list.
       // Since there is no existing image with the name $machine_name,
@@ -1196,13 +1196,14 @@ class WcmsTestsBlocksListingsCest {
     $i->waitForText('Are you sure you want to remove section 1?');
     $i->click('Remove');
     $i->waitForElementNotVisible('.layout-builder__region');
-    $i->click('.layout-builder__link--add');
-    $i->waitForText('One column', 30);
+    $i->waitForText('Add section');
+    $i->click('Add section');
+    $i->waitForText('One column');
     $i->click('One column');
-    $i->waitForText('Configure section', 30);
-    $i->waitForText('Add section', 30);
+    $i->waitForText('Configure section');
+    $i->waitForText('Add section');
     $i->click('input[value="Add section"]');
-    $i->waitForText('Add block', 30);
+    $i->waitForText('Add block');
   }
 
   /**