diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index be3c040a236..9ada74f5378 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -331,14 +331,14 @@ Feature: Perform basic calendar functionality
     And I click on "My own user event" "link"
     Then I should see "User event"
     And I should not see "Group 1"
-    And I click on "Edit" "button"
+    And I click on "Edit" "button" in the "My own user event" "dialogue"
     And I set the following fields to these values:
       | Event title | Site event |
       | Type of event | site |
     And I press "Save"
     And I click on "Site event" "link"
     And I should see "Site event"
-    And I click on "Edit" "button"
+    And I click on "Edit" "button" in the "Site event" "dialogue"
     And I set the following fields to these values:
       | Event title | Course 1 event |
       | Type of event | course |
@@ -347,7 +347,7 @@ Feature: Perform basic calendar functionality
     And I press "Save"
     And I click on "Course 1 event" "link"
     And I should see "Course event"
-    And I click on "Edit" "button"
+    And I click on "Edit" "button" in the "Course 1 event" "dialogue"
     And I set the following fields to these values:
       | Event title | Category event |
       | Type of event | category |
diff --git a/mod/assign/tests/behat/edit_previous_feedback.feature b/mod/assign/tests/behat/edit_previous_feedback.feature
index 8ca7b49efeb..204fe5605d1 100644
--- a/mod/assign/tests/behat/edit_previous_feedback.feature
+++ b/mod/assign/tests/behat/edit_previous_feedback.feature
@@ -52,7 +52,7 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
     And I click on "Grade" "link" in the "Student 2" "table_row"
     And I click on "View a different attempt" "link"
     And I click on "Attempt 1" "radio" in the "View a different attempt" "dialogue"
-    And I click on "View" "button"
+    And I click on "View" "button" in the "View a different attempt" "dialogue"
     And I set the following fields to these values:
       | Grade | 50 |
       | Feedback comments | I'm the teacher second feedback |