diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index f1d615319ff..5823298e17e 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -61,7 +61,7 @@ Feature: Perform basic calendar functionality
     And I follow "This month"
     And I click on "Really awesome event!" "link"
     And "Course 1" "link" should exist in the ".modal-body" "css_element"
-    And I click on ".close" "css_element"
+    And I click on "Close" "button"
     And I log out
     And I log in as "student2"
     And I follow "This month"
diff --git a/repository/tests/behat/cancel_add_file.feature b/repository/tests/behat/cancel_add_file.feature
index 7f9bcf81e5e..2742d5798bb 100644
--- a/repository/tests/behat/cancel_add_file.feature
+++ b/repository/tests/behat/cancel_add_file.feature
@@ -23,7 +23,7 @@ Feature: A selected file can be cancelled
     And I click on "Recent files" "link" in the ".fp-repo-area" "css_element"
     And I click on "//a[contains(concat(' ', normalize-space(@class), ' '), ' fp-file ')][normalize-space(.)='empty.txt']" "xpath_element"
     And I click on ".moodle-dialogue-focused .fp-select .fp-select-cancel" "css_element"
-    And I click on ".moodle-dialogue-focused.filepicker .yui3-button.closebutton" "css_element"
+    And I click on "Close" "button" in the "File picker" "dialogue"
     And I press "Save and display"
     Then I should see "upload_users.csv"
     And I should not see "empty.txt"