diff --git a/blocks/activity_modules/tests/behat/block_activity_modules.feature b/blocks/activity_modules/tests/behat/block_activity_modules.feature
index 8763deaaf1d..3eefd4e5742 100644
--- a/blocks/activity_modules/tests/behat/block_activity_modules.feature
+++ b/blocks/activity_modules/tests/behat/block_activity_modules.feature
@@ -55,7 +55,7 @@ Feature: Block activity modules
     And I click on "Forums" "link" in the "Activities" "block"
     And I should see "Frontpage forum name"
     And I am on homepage
-    And I click on "External Tools" "link" in the "Activities" "block"
+    And I click on "External tools" "link" in the "Activities" "block"
     And I should see "Frontpage lti name"
     And I am on homepage
     And I click on "Quizzes" "link" in the "Activities" "block"
@@ -134,7 +134,7 @@ Feature: Block activity modules
     And I click on "Forums" "link" in the "Activities" "block"
     And I should see "Test forum name"
     And I follow "Course 1"
-    And I click on "External Tools" "link" in the "Activities" "block"
+    And I click on "External tools" "link" in the "Activities" "block"
     And I should see "Test lti name"
     And I follow "Course 1"
     And I click on "Quizzes" "link" in the "Activities" "block"
diff --git a/lib/editor/atto/plugins/title/tests/behat/title.feature b/lib/editor/atto/plugins/title/tests/behat/title.feature
index 15e4e8e7ce2..4a6de33999e 100644
--- a/lib/editor/atto/plugins/title/tests/behat/title.feature
+++ b/lib/editor/atto/plugins/title/tests/behat/title.feature
@@ -10,7 +10,7 @@ Feature: Atto title
     And I set the field "Description" to "How The Rock Has Made the WWE World Heavyweight Title More Important Than Ever"
     And I select the text in the "Description" Atto editor
     When I click on "Paragraph styles" "button"
-    When I click on "Heading 1" "link"
+    When I click on "Heading (large)" "link"
     And I press "Update profile"
     And I follow "Edit profile"
     Then I should see "<h3>How The Rock"
diff --git a/mod/choice/tests/behat/publish_results_anonymously.feature b/mod/choice/tests/behat/publish_results_anonymously.feature
index b7e55b787e4..0d7b5d10f1d 100644
--- a/mod/choice/tests/behat/publish_results_anonymously.feature
+++ b/mod/choice/tests/behat/publish_results_anonymously.feature
@@ -40,7 +40,7 @@ Feature: A teacher can choose whether to publish choice activity results anonymo
     And I follow "Course 1"
     And I follow "Choice 1"
     Then I should not see "Student 1"
-    And I should not see "User choose this option"
+    And I should not see "Users who chose this option"
     And I hover ".results .graph img" "css_element"
 
   @javascript
@@ -61,4 +61,4 @@ Feature: A teacher can choose whether to publish choice activity results anonymo
     And I follow "Course 1"
     And I follow "Choice 1"
     Then I should see "Student 1"
-    And I should see "User choose this option"
+    And I should see "Users who chose this option"
diff --git a/mod/forum/tests/behat/discussion_subscriptions.feature b/mod/forum/tests/behat/discussion_subscriptions.feature
index f8f30773233..8fcf0f94de0 100644
--- a/mod/forum/tests/behat/discussion_subscriptions.feature
+++ b/mod/forum/tests/behat/discussion_subscriptions.feature
@@ -218,7 +218,7 @@ Feature: A user can control their own subscription preferences for a discussion
     And I reply "Test post subject one" post from "Test forum name" forum with:
       | Subject | Reply 1 to discussion 1 |
       | Message | Discussion contents 1, second message |
-      | Discussion subscription | Send me email copies of posts to this discussion |
+      | Discussion subscription | I don't want to be notified of new posts in this discussion |
     And I reply "Test post subject two" post from "Test forum name" forum with:
       | Subject | Reply 1 to discussion 1 |
       | Message | Discussion contents 1, second message |
@@ -228,7 +228,7 @@ Feature: A user can control their own subscription preferences for a discussion
     And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row"
     And I follow "Test post subject one"
     And I follow "Reply"
-    And the field "Discussion subscription" matches value "Send me email copies of posts to this discussion"
+    And the field "Discussion subscription" matches value "I don't want to be notified of new posts in this discussion"
     And I follow "Test forum name"
     And I follow "Test post subject two"
     And I follow "Reply"
@@ -254,7 +254,7 @@ Feature: A user can control their own subscription preferences for a discussion
     And I reply "Test post subject one" post from "Test forum name" forum with:
       | Subject | Reply 1 to discussion 1 |
       | Message | Discussion contents 1, second message |
-      | Discussion subscription | Send me email copies of posts to this discussion |
+      | Discussion subscription | I don't want to be notified of new posts in this discussion |
     And I reply "Test post subject two" post from "Test forum name" forum with:
       | Subject | Reply 1 to discussion 1 |
       | Message | Discussion contents 1, second message |
@@ -264,7 +264,7 @@ Feature: A user can control their own subscription preferences for a discussion
     And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row"
     And I follow "Test post subject one"
     And I follow "Reply"
-    And the field "Discussion subscription" matches value "Send me email copies of posts to this discussion"
+    And the field "Discussion subscription" matches value "I don't want to be notified of new posts in this discussion"
     And I follow "Test forum name"
     And I follow "Test post subject two"
     And I follow "Reply"