diff --git a/acceptance/WcmsTestsBlocksListingsCest.php b/acceptance/WcmsTestsBlocksListingsCest.php
index 11f064e8d96647bbf34cbde59d00dd651960c0f2..75c251070df946e59c93f6ad33c51c2b252d835c 100644
--- a/acceptance/WcmsTestsBlocksListingsCest.php
+++ b/acceptance/WcmsTestsBlocksListingsCest.php
@@ -67,6 +67,7 @@ class WcmsTestsBlocksListingsCest {
     $i->see('Edit layout for ' . $this->nodesUsed['Multi Type List Block']->getTitle());
 
     // Add a block.
+    $i->waitForText('Add block');
     $i->click('Add block');
     $i->waitForText('Choose a block');
 
@@ -170,6 +171,7 @@ class WcmsTestsBlocksListingsCest {
     $i->see('Edit layout for ' . $this->nodesUsed['Automatic List Block']->getTitle());
 
     // Add a block.
+    $i->waitForText('Add block');
     $i->click('Add block');
     $i->waitForText('Choose a block');
 
@@ -212,6 +214,7 @@ class WcmsTestsBlocksListingsCest {
     $i->see('Edit layout for ' . $this->nodesUsed['Manual List Block']->getTitle());
 
     // Add a block.
+    $i->waitForText('Add block');
     $i->click('Add block');
     $i->waitForText('Choose a block');
 
@@ -366,6 +369,7 @@ class WcmsTestsBlocksListingsCest {
     $i->see('Edit layout for ' . $this->nodesUsed['Waterloo Events Block']->getTitle());
 
     // Add a block.
+    $i->waitForText('Add block');
     $i->click('Add block');
     $i->waitForText('Choose a block');
 
@@ -450,6 +454,7 @@ class WcmsTestsBlocksListingsCest {
       $i->waitforText('Edit layout for testpage');
 
       // Add an automatic list block.
+      $i->waitForText('Add block');
       $i->click('Add block');
       $i->waitForText('Choose a block');
       $i->click('Automatic list');
@@ -463,6 +468,7 @@ class WcmsTestsBlocksListingsCest {
       $i->waitForElement('.uw-admin-label');
 
       // Add an manual list block.
+      $i->waitForText('Add block');
       $i->click('Add block');
       $i->waitForText('Choose a block');
       $i->click('Manual list');
@@ -950,6 +956,7 @@ class WcmsTestsBlocksListingsCest {
         $i->waitForText('Automatic list');
         $i->waitForElement('.views-field-field-uw-service-summary');
         $this->removeAddFirstSection($i);
+        $i->waitForText('Add block');
         $i->click('Add block');
         $i->waitForText('Choose a block');
         $i->click('Automatic list');
@@ -1040,6 +1047,7 @@ class WcmsTestsBlocksListingsCest {
         break;
 
       case 'catalog':
+        $i->waitForText('Add block');
         $i->click('Add block');
         $i->waitForText('Choose a block');
         $i->click('Automatic list');
@@ -1134,6 +1142,7 @@ class WcmsTestsBlocksListingsCest {
         break;
 
       case 'service':
+        $i->waitForText('Add block');
         $i->click('Add block');
         $i->waitForText('Choose a block');
         $i->click('Automatic list');
@@ -1228,6 +1237,7 @@ class WcmsTestsBlocksListingsCest {
     int $limit = 3,
   ) {
 
+    $i->waitForText('Add block');
     $i->click('Add block');
     $i->waitForText('Choose a block');
     $i->click($block_type);