diff --git a/testsuite/features/step_definitions/common_steps.rb b/testsuite/features/step_definitions/common_steps.rb
index 26f0b089b218..7f575c92398b 100644
--- a/testsuite/features/step_definitions/common_steps.rb
+++ b/testsuite/features/step_definitions/common_steps.rb
@@ -142,12 +142,16 @@
   # same name in the events history - however, that's the best we have so far.
   steps %(
     When I follow "Events"
+    And I wait until I see "Pending Events" text
     And I follow "Pending"
+    And I wait until I see "Pending Events" text
     And I wait at most #{pickup_timeout} seconds until I do not see "#{event}" text, refreshing the page
     And I follow "History"
     And I wait until I see "System History" text
     And I wait until I see "#{event}" text, refreshing the page
     And I follow first "#{event}"
+    And I wait until I see "This action will be executed after" text
+    And I wait until I see "#{event}" text
     And I wait at most #{complete_timeout} seconds until the event is completed, refreshing the page
   )
 end