diff --git a/admin/tool/dataprivacy/tests/behat/contact_privacy_officer.feature b/admin/tool/dataprivacy/tests/behat/contact_privacy_officer.feature
index e015d194c32..528d1f69325 100644
--- a/admin/tool/dataprivacy/tests/behat/contact_privacy_officer.feature
+++ b/admin/tool/dataprivacy/tests/behat/contact_privacy_officer.feature
@@ -20,7 +20,7 @@ Feature: Contact the privacy officer
     And I should see "Contact the privacy officer"
     And I click on "Contact the privacy officer" "link"
     And I set the field "Message" to "Hello DPO!"
-    And I press "Send"
+    And I click on "Send" "button" in the "Contact the privacy officer" "dialogue"
     And I should see "Your request has been submitted to the privacy officer"
     And I click on "Data requests" "link"
     And I should see "Hello DPO!" in the "General inquiry" "table_row"
diff --git a/admin/tool/dataprivacy/tests/behat/manage_categories.feature b/admin/tool/dataprivacy/tests/behat/manage_categories.feature
index fb230d7a859..8d47ff894dd 100644
--- a/admin/tool/dataprivacy/tests/behat/manage_categories.feature
+++ b/admin/tool/dataprivacy/tests/behat/manage_categories.feature
@@ -12,7 +12,7 @@ Feature: Manage data categories
     And I press "Add category"
     And I set the field "Name" to "Category 1"
     And I set the field "Description" to "Category 1 description"
-    When I press "Save"
+    When I click on "Save" "button" in the "Delete category" "button"
     Then I should see "Category 1" in the "List of data categories" "table"
     And I should see "Category 1 description" in the "Category 1" "table_row"
 
@@ -30,5 +30,5 @@ Feature: Manage data categories
     And I choose "Delete" in the open action menu
     And I should see "Delete category"
     And I should see "Are you sure you want to delete the category 'Category 1'?"
-    When I press "Delete"
+    When I click on "Delete" "button" in the "Confirm" "button"
     Then I should not see "Category 1" in the "List of data categories" "table"
diff --git a/admin/tool/dataprivacy/tests/behat/manage_data_requests.feature b/admin/tool/dataprivacy/tests/behat/manage_data_requests.feature
index cd1bc2a4b0a..bf839ed6542 100644
--- a/admin/tool/dataprivacy/tests/behat/manage_data_requests.feature
+++ b/admin/tool/dataprivacy/tests/behat/manage_data_requests.feature
@@ -21,14 +21,14 @@ Feature: Manage data requests
     And I should see "Contact the privacy officer"
     And I click on "Contact the privacy officer" "link"
     And I set the field "Message" to "Hi PO! Can others access my information on your site?"
-    And I press "Send"
+    And I click on "Send" "button" in the "Contact the privacy officer" "dialogue"
     And I should see "Your request has been submitted to the privacy officer"
     And I log out
     And I log in as "student2"
     And I follow "Profile" in the user menu
     And I click on "Contact the privacy officer" "link"
     And I set the field "Message" to "Dear Mr. Privacy Officer, I'd like to know more about GDPR. Thanks!"
-    And I press "Send"
+    And I click on "Send" "button" in the "Contact the privacy officer" "dialogue"
     And I should see "Your request has been submitted to the privacy officer"
     And I log out
     When I log in as "admin"
diff --git a/admin/tool/dataprivacy/tests/behat/manage_purposes.feature b/admin/tool/dataprivacy/tests/behat/manage_purposes.feature
index ff029252f83..772c590bce8 100644
--- a/admin/tool/dataprivacy/tests/behat/manage_purposes.feature
+++ b/admin/tool/dataprivacy/tests/behat/manage_purposes.feature
@@ -52,5 +52,5 @@ Feature: Manage data storage purposes
     And I choose "Delete" in the open action menu
     And I should see "Delete purpose"
     And I should see "Are you sure you want to delete the purpose 'Purpose 1'?"
-    When I press "Delete"
+    When I click on "Delete" "button" in the "Confirm" "dialogue"
     Then I should not see "Purpose 1" in the "List of data purposes" "table"
diff --git a/admin/tool/lp/tests/behat/plan_crud.feature b/admin/tool/lp/tests/behat/plan_crud.feature
index f1ff7ddb121..d2ca869842c 100644
--- a/admin/tool/lp/tests/behat/plan_crud.feature
+++ b/admin/tool/lp/tests/behat/plan_crud.feature
@@ -124,9 +124,9 @@ Feature: Manage plearning plan
     And "Confirm" "dialogue" should be visible
     And "Delete" "button" should exist in the "Confirm" "dialogue"
     And "Cancel" "button" should exist in the "Confirm" "dialogue"
-    And I click on "Cancel" "button"
+    And I click on "Cancel" "button" in the "Confirm" "dialogue"
     And I click on "Delete" of edit menu in the "Science plan Year-4" row
     And "Confirm" "dialogue" should be visible
-    When I click on "Delete" "button"
+    When I click on "Delete" "button" in the "Confirm" "dialogue"
     And I wait until the page is ready
     Then I should not see "Science plan Year-4"
diff --git a/admin/tool/lp/tests/behat/template_crud.feature b/admin/tool/lp/tests/behat/template_crud.feature
index e2f806ffa44..0156243a98d 100644
--- a/admin/tool/lp/tests/behat/template_crud.feature
+++ b/admin/tool/lp/tests/behat/template_crud.feature
@@ -52,9 +52,9 @@ Feature: Manage plearning plan templates
     And "Confirm" "dialogue" should be visible
     And "Delete" "button" should exist in the "Confirm" "dialogue"
     And "Cancel" "button" should exist in the "Confirm" "dialogue"
-    And I click on "Cancel" "button"
+    And I click on "Cancel" "button" in the "Confirm" "dialogue"
     And I click on "Delete" of edit menu in the "Science template Year-4" row
     And "Confirm" "dialogue" should be visible
-    When I click on "Delete" "button"
+    When I click on "Delete" "button" in the "Confirm" "dialogue"
     And I wait until the page is ready
     Then I should not see "Science template Year-4"
diff --git a/admin/tool/policy/tests/behat/acceptances.feature b/admin/tool/policy/tests/behat/acceptances.feature
index da4749fc7ae..b35a20ea08b 100644
--- a/admin/tool/policy/tests/behat/acceptances.feature
+++ b/admin/tool/policy/tests/behat/acceptances.feature
@@ -283,7 +283,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I press "Consent"
     And I should see "Accepting policy"
     And I should see "One"
-    And I press "Cancel"
+    And I click on "Cancel" "button" in the "Accepting policy" "dialogue"
     And I should not see "Accepting policy"
     And I click on "Select" "checkbox" in the "User Two" "table_row"
     And I press "Consent"
diff --git a/admin/tool/recyclebin/tests/behat/basic_functionality.feature b/admin/tool/recyclebin/tests/behat/basic_functionality.feature
index 5edb0432067..744b6d070f6 100644
--- a/admin/tool/recyclebin/tests/behat/basic_functionality.feature
+++ b/admin/tool/recyclebin/tests/behat/basic_functionality.feature
@@ -95,7 +95,7 @@ Feature: Basic recycle bin functionality
     And I navigate to "Recycle bin" in current page administration
     When I click on "Delete" "link"
     Then I should see "Are you sure you want to delete the selected item from the recycle bin?"
-    And I press "Cancel"
+    And I click on "Cancel" "button" in the "Confirmation" "dialogue"
     And I should see "Test assign"
     And I click on "Delete" "link"
     And I press "Yes"
@@ -120,7 +120,7 @@ Feature: Basic recycle bin functionality
     And I should see "Test assign 2"
     When I click on "Delete all" "link"
     Then I should see "Are you sure you want to delete all items from the recycle bin?"
-    And I press "Cancel"
+    And I click on "Cancel" "button" in the "Add restriction..." "dialogue"
     And I should see "Test assign 1"
     And I should see "Test assign 2"
     And I click on "Delete all" "link"
diff --git a/availability/condition/group/tests/behat/availability_group.feature b/availability/condition/group/tests/behat/availability_group.feature
index ceae232b520..c5e07292883 100644
--- a/availability/condition/group/tests/behat/availability_group.feature
+++ b/availability/condition/group/tests/behat/availability_group.feature
@@ -44,7 +44,7 @@ Feature: availability_group
     Then "Group" "button" should exist in the "Add restriction..." "dialogue"
 
     # Page P1 any group.
-    Given I click on "Group" "button"
+    Given I click on "Group" "button" in the "Add restriction..." "dialogue"
     And I set the field "Group" to "(Any group)"
     And I click on ".availability-item .availability-eye img" "css_element"
     And I set the following fields to these values:
@@ -61,7 +61,7 @@ Feature: availability_group
       | Page content | x  |
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
-    And I click on "Group" "button"
+    And I click on "Group" "button" in the "Add restriction..." "dialogue"
     And I set the field "Group" to "G1"
     And I click on ".availability-item .availability-eye img" "css_element"
     And I click on "Save and return to course" "button"
@@ -74,7 +74,7 @@ Feature: availability_group
       | Page content | x  |
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
-    And I click on "Group" "button"
+    And I click on "Group" "button" in the "Add restriction..." "dialogue"
     And I set the field "Group" to "G2"
     And I click on ".availability-item .availability-eye img" "css_element"
     And I click on "Save and return to course" "button"
diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index 5483edb94a6..22aed84b75e 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -106,7 +106,7 @@ Feature: Perform basic calendar functionality
     And I am on "Course 1" course homepage
     When I follow "This month"
     And I click on "Really awesome event!" "link"
-    And I click on "Delete" "button"
+    And I click on "Delete" "button" in the "Really awesome event!" "dialogue"
     And I click on "Delete event" "button"
     And I wait to be redirected
     Then I should not see "Really awesome event!"
@@ -146,8 +146,8 @@ Feature: Perform basic calendar functionality
     Then I should see "Test choice opens"
     And I should see "Test choice closes"
     When I click on "Test choice opens" "link"
-    Then "Delete" "button" should not exist
-    And "Edit" "button" should not exist
+    Then "Delete" "button" should not exist in the "Test choice opens" "dialogue"
+    And "Edit" "button" should not exist in the "Test choice opens" "dialogue"
     And I should see "Course event"
     When I click on "Go to activity" "link"
     And I wait to be redirected
@@ -155,8 +155,8 @@ Feature: Perform basic calendar functionality
     And I am on "Course 1" course homepage
     And I follow "This month"
     When I click on "Test choice closes" "link"
-    Then "Delete" "button" should not exist
-    And "Edit" "button" should not exist
+    Then "Delete" "button" should not exist in the "Test choice closes" "dialogue"
+    And "Edit" "button" should not exist in the "Test choice closes" "dialogue"
     And I should see "Course event"
     When I click on "Go to activity" "link"
     And I wait to be redirected
diff --git a/mod/quiz/tests/behat/editing_add.feature b/mod/quiz/tests/behat/editing_add.feature
index 71e54dc2132..ac084ded83d 100644
--- a/mod/quiz/tests/behat/editing_add.feature
+++ b/mod/quiz/tests/behat/editing_add.feature
@@ -130,7 +130,7 @@ Feature: Edit quiz page - adding things
     # Create the Essay 01 question.
     When I press "Create a new question ..."
     And I set the field "item_qtype_essay" to "1"
-    And I press "Add"
+    And I click on "Add" "button" in the "Choose a question type to add" "dialogue"
     Then I should see "Adding an Essay question"
     And I set the field "Question name" to "Essay 01"
     And I set the field "Question text" to "Please write 100 words about Essay 01"
diff --git a/question/tests/behat/edit_questions_standard_tags.feature b/question/tests/behat/edit_questions_standard_tags.feature
index d231c5f115b..8dce668dc24 100644
--- a/question/tests/behat/edit_questions_standard_tags.feature
+++ b/question/tests/behat/edit_questions_standard_tags.feature
@@ -25,8 +25,8 @@ Feature: The questions can be tagged
     And I navigate to "Question bank > Questions" in current page administration
     And I press "Create a new question ..."
     And I set the field "item_qtype_truefalse" to "1"
-    And I press "Add"
+    And I click on "Add" "button" in the "Confirm" "dialogue"
     And I expand all fieldsets
     And I open the autocomplete suggestions list
     Then "foo" "autocomplete_suggestions" should exist
-    And "bar" "autocomplete_suggestions" should exist
\ No newline at end of file
+    And "bar" "autocomplete_suggestions" should exist
diff --git a/question/type/ddimageortext/tests/behat/add.feature b/question/type/ddimageortext/tests/behat/add.feature
index 44972d4009a..127e9f5fc60 100644
--- a/question/type/ddimageortext/tests/behat/add.feature
+++ b/question/type/ddimageortext/tests/behat/add.feature
@@ -22,7 +22,7 @@ Feature: Test creating a drag and drop onto image question
   Scenario: Create a drag and drop onto image question
     When I press "Create a new question ..."
     And I set the field "Drag and drop onto image" to "1"
-    And I press "Add"
+    And I click on "Add" "button" in the "Choose a new question type to add" "dialogue"
     And I set the field "Question name" to "Drag and drop onto image 001"
     And I set the field "Question text" to "Identify the features in this cross-section."
     And I set the field "General feedback" to "The locations are now labelled on the diagram below."
diff --git a/question/type/ddmarker/tests/behat/add.feature b/question/type/ddmarker/tests/behat/add.feature
index 6a271c85b9b..b6c61b41ea2 100644
--- a/question/type/ddmarker/tests/behat/add.feature
+++ b/question/type/ddmarker/tests/behat/add.feature
@@ -22,7 +22,7 @@ Feature: Test creating a drag and drop markers question
   Scenario: Create a drag and drop markers question
     When I press "Create a new question ..."
     And I set the field "Drag and drop markers" to "1"
-    And I press "Add"
+    And I click on "Add" "button" in the "Confirm" "dialogue"
     And I set the field "Question name" to "Drag and drop markers"
     And I set the field "Question text" to "Please place the markers on the map of Milton Keynes and be aware that there is more than one railway station."
     And I set the field "General feedback" to "The Open University is at the junction of Brickhill Street and Groveway. There are three railway stations, Wolverton, Milton Keynes Central and Bletchley."
diff --git a/tag/tests/behat/edit_tag.feature b/tag/tests/behat/edit_tag.feature
index 4eb32c57840..c1913da4875 100644
--- a/tag/tests/behat/edit_tag.feature
+++ b/tag/tests/behat/edit_tag.feature
@@ -177,7 +177,7 @@ Feature: Users can edit tags to add description or rename
     And I set the field "New name for tag Turtle" to "DOG"
     And I press key "13" in the field "New name for tag Turtle"
     And I should see "The tag name is already in use. Do you want to combine these tags?"
-    And I press "Cancel"
+    And I click on "Cancel" "button in the "Confirm" "dialogue"
     And "New name for tag" "field" should not exist
     And I should see "Turtle"
     And I should see "Dog"
diff --git a/user/tests/behat/edit_user_enrolment.feature b/user/tests/behat/edit_user_enrolment.feature
index 0d8a38e26cc..db3139dbe05 100644
--- a/user/tests/behat/edit_user_enrolment.feature
+++ b/user/tests/behat/edit_user_enrolment.feature
@@ -58,7 +58,7 @@ Feature: Edit user enrolment
     And I should see "Student 1" in the "Full name" "table_row"
     And I should see "Active" in the "//td[@class='user-enrol-status']" "xpath_element"
     And I should see "Manual enrolments" in the "Enrolment method" "table_row"
-    And I press "Cancel"
+    And I click on "Cancel" "button" in the "Enrolment details" "dialogue"
     And I click on "Manual enrolments" "icon" in the "student2" "table_row"
     And I should see "Enrolment details"
     And I should see "Student 2" in the "Full name" "table_row"