diff --git a/lib/editor/tiny/plugins/equation/tests/behat/equation.feature b/lib/editor/tiny/plugins/equation/tests/behat/equation.feature
index 82bf233c5ce..9db1640761c 100644
--- a/lib/editor/tiny/plugins/equation/tests/behat/equation.feature
+++ b/lib/editor/tiny/plugins/equation/tests/behat/equation.feature
@@ -1,5 +1,5 @@
 @editor @editor_tiny @tiny_equation
-Feature: Tiny equation editor
+Feature: Equation editor
   To teach maths to students, I need to write equations
 
   @javascript
diff --git a/lib/editor/tiny/plugins/noautolink/tests/behat/noautolink.feature b/lib/editor/tiny/plugins/noautolink/tests/behat/noautolink.feature
index b72297ea217..4715d58da03 100644
--- a/lib/editor/tiny/plugins/noautolink/tests/behat/noautolink.feature
+++ b/lib/editor/tiny/plugins/noautolink/tests/behat/noautolink.feature
@@ -6,7 +6,7 @@ Feature: Tiny noautolink
   Scenario: Insert a link, add and remove the auto-link prevention
     Given I log in as "admin"
     And I navigate to "Plugins > Text editors > TinyMCE editor > General settings" in site administration
-    And I click on "Enable Tiny no auto-link" "link"
+    And I click on "Enable No auto-link" "link"
     When I open my profile in edit mode
     And I set the field "Description" to "<p>https://moodle.org</p>"
 
diff --git a/lib/editor/tiny/tests/behat/manage_subplugins.feature b/lib/editor/tiny/tests/behat/manage_subplugins.feature
index 895f9b83f81..6b0e0c030b9 100644
--- a/lib/editor/tiny/tests/behat/manage_subplugins.feature
+++ b/lib/editor/tiny/tests/behat/manage_subplugins.feature
@@ -8,23 +8,23 @@ Feature: An administrator can manage TinyMCE subplugins
   Scenario: An administrator can control the enabled state of TinyMCE subplugins using JavaScript
     Given I am logged in as "admin"
     And I navigate to "Plugins > Text editors > TinyMCE editor > General settings" in site administration
-    When I click on "Disable Tiny equation editor" "link"
-    Then I should see "Tiny equation editor disabled."
-    And "Disable Tiny equation editor" "link" should not exist
-    But "Enable Tiny equation editor" "link" should exist
-    When I click on "Enable Tiny equation editor" "link"
-    Then I should see "Tiny equation editor enabled."
-    And "Enable Tiny equation editor" "link" should not exist
-    But "Disable Tiny equation editor" "link" should exist
+    When I click on "Disable Equation editor" "link"
+    Then I should see "Equation editor disabled."
+    And "Disable Equation editor" "link" should not exist
+    But "Enable Equation editor" "link" should exist
+    When I click on "Enable Equation editor" "link"
+    Then I should see "Equation editor enabled."
+    And "Enable Equation editor" "link" should not exist
+    But "Disable Equation editor" "link" should exist
 
   Scenario: An administrator can control the enabled state of TinyMCE subplugins without JavaScript
     Given I am logged in as "admin"
     And I navigate to "Plugins > Text editors > TinyMCE editor > General settings" in site administration
-    When I click on "Disable Tiny equation editor" "link"
-    Then I should see "Tiny equation editor disabled."
-    And "Disable Tiny equation editor" "link" should not exist
-    But "Enable Tiny equation editor" "link" should exist
-    When I click on "Enable Tiny equation editor" "link"
-    Then I should see "Tiny equation editor enabled."
-    And "Enable Tiny equation editor" "link" should not exist
-    But "Disable Tiny equation editor" "link" should exist
+    When I click on "Disable Equation editor" "link"
+    Then I should see "Equation editor disabled."
+    And "Disable Equation editor" "link" should not exist
+    But "Enable Equation editor" "link" should exist
+    When I click on "Enable Equation editor" "link"
+    Then I should see "Equation editor enabled."
+    And "Enable Equation editor" "link" should not exist
+    But "Disable Equation editor" "link" should exist
diff --git a/mod/quiz/report/grading/tests/behat/grading.feature b/mod/quiz/report/grading/tests/behat/grading.feature
index 94ac9125f30..8ef6f2c3646 100644
--- a/mod/quiz/report/grading/tests/behat/grading.feature
+++ b/mod/quiz/report/grading/tests/behat/grading.feature
@@ -130,15 +130,15 @@ Feature: Basic use of the Manual grading report
     And I click on "update grades" "link" in the "Short answer 001" "table_row"
     When I set the following fields to these values:
       | Questions per page | 0 |
-    Then I should see "You must enter a number that is greater than 0."
+    Then I should see "You must enter a whole number that is greater than 0."
     And I set the following fields to these values:
       | Questions per page | -1 |
     And I press "Change options"
-    And I should see "You must enter a number that is greater than 0."
+    And I should see "You must enter a whole number that is greater than 0."
     And I set the following fields to these values:
       | Questions per page | abc |
     And I press "Change options"
-    And I should see "You must enter a number that is greater than 0."
+    And I should see "You must enter a whole number that is greater than 0."
     And I set the following fields to these values:
       | Questions per page | 1 |
     And I press "Change options"
@@ -152,7 +152,7 @@ Feature: Basic use of the Manual grading report
     And I follow "Also show questions that have been graded automatically"
     And I click on "update grades" "link" in the "Short answer 001" "table_row"
     Then I should see "Attempt number 1 for S1 Student1 (student1, S1000, student1@example.com, little yellow frog)"
-    And I should not see "You must enter a number that is greater than 0."
+    And I should not see "You must enter a whole number that is greater than 0."
 
   Scenario: A marker cannot access the report in separate group
     Given user "student1" has attempted "Quiz 1" with responses:
diff --git a/mod/quiz/tests/behat/editing_multiple_grades.feature b/mod/quiz/tests/behat/editing_multiple_grades.feature
index 73b6d7520db..6c52da061c6 100644
--- a/mod/quiz/tests/behat/editing_multiple_grades.feature
+++ b/mod/quiz/tests/behat/editing_multiple_grades.feature
@@ -168,7 +168,7 @@ Feature: Setup multiple grades for a quiz
       | Listening | 3         | 0       |
 
     When I am on the "Quiz 1" "mod_quiz > multiple grades setup" page logged in as teacher
-    And I press "Setup a grade for each section"
+    And I press "Set up a grade for each section"
 
     Then "Reading" "table_row" should exist in the "mod_quiz-grade-item-list" "table"
     And "Listening" "table_row" should exist in the "mod_quiz-grade-item-list" "table"