diff --git a/admin/tool/behat/tests/behat/manipulate_forms.feature b/admin/tool/behat/tests/behat/manipulate_forms.feature
index 866798fc5c4b7..707ede0ea978a 100644
--- a/admin/tool/behat/tests/behat/manipulate_forms.feature
+++ b/admin/tool/behat/tests/behat/manipulate_forms.feature
@@ -27,9 +27,9 @@ Feature: Forms manipulation
     And I log in as "admin"
     And I follow "Course 1"
     And I turn editing mode on
-    And I add a "forum" to section "1"
+    And I add a "Quiz" to section "1"
     When I expand all fieldsets
-    Then I should see "Display word count"
+    Then I should see "Close the quiz"
     And I should see "Group mode"
     And I should see "Grouping"
     And I should not see "Show more..."
diff --git a/backup/util/ui/tests/behat/restore_moodle2_courses.feature b/backup/util/ui/tests/behat/restore_moodle2_courses.feature
index 177a92bbb6e94..dd37619627dd4 100644
--- a/backup/util/ui/tests/behat/restore_moodle2_courses.feature
+++ b/backup/util/ui/tests/behat/restore_moodle2_courses.feature
@@ -80,6 +80,7 @@ Feature: Restore Moodle 2 course backups
     Then I should see "Topic 1"
     And I should see "Test forum name"
     And I follow "Edit settings"
+    And I expand all fieldsets
     And the "id_format" field should match "Topics format" value
     And I fill the moodle form with:
       | id_startdate_day | 1 |
@@ -90,18 +91,21 @@ Feature: Restore Moodle 2 course backups
     And I should see "1 January - 7 January"
     And I should see "Test forum name"
     And I follow "Edit settings"
+    And I expand all fieldsets
     And the "id_format" field should match "Weekly format" value
     And I fill the moodle form with:
       | id_format | Social format |
     And I press "Save changes"
     And I should see "An open forum for chatting about anything you want to"
     And I follow "Edit settings"
+    And I expand all fieldsets
     And the "id_format" field should match "Social format" value
     And I fill the moodle form with:
       | id_format | SCORM format |
     And I press "Save changes"
     And I should see "Adding a new SCORM package"
     And I follow "Edit settings"
+    And I expand all fieldsets
     And the "id_format" field should match "SCORM format" value
     And I press "Cancel"
 
diff --git a/completion/tests/behat/enable_manual_complete_mark.feature b/completion/tests/behat/enable_manual_complete_mark.feature
index 7ec03a12334f5..ccc3511f02419 100644
--- a/completion/tests/behat/enable_manual_complete_mark.feature
+++ b/completion/tests/behat/enable_manual_complete_mark.feature
@@ -27,7 +27,7 @@ Feature: Allow students to manually mark an activity as complete
     And I turn editing mode on
     And I follow "Edit settings"
     And I fill the moodle form with:
-      | Completion tracking | Enabled, control via completion and activity settings |
+      | Enable completion tracking | Yes |
     And I press "Save changes"
     When I add a "Forum" to section "1" and I fill the form with:
       | Forum name | Test forum name |
diff --git a/completion/tests/behat/restrict_section_availability.feature b/completion/tests/behat/restrict_section_availability.feature
index 2c85504f04065..00cef9bca650e 100644
--- a/completion/tests/behat/restrict_section_availability.feature
+++ b/completion/tests/behat/restrict_section_availability.feature
@@ -27,7 +27,7 @@ Feature: Restrict sections availability through completion conditions
     And I turn editing mode on
     And I follow "Edit settings"
     And I fill the moodle form with:
-      | Completion tracking | Enabled, control via completion and activity settings |
+      | Enable completion tracking | Yes |
     And I press "Save changes"
     And I add a "Label" to section "1" and I fill the form with:
       | Label text | Test label |
diff --git a/mod/forum/tests/behat/completion_condition_number_discussions.feature b/mod/forum/tests/behat/completion_condition_number_discussions.feature
index 1f2052d1cbe29..529208c92d0ac 100644
--- a/mod/forum/tests/behat/completion_condition_number_discussions.feature
+++ b/mod/forum/tests/behat/completion_condition_number_discussions.feature
@@ -27,7 +27,7 @@ Feature: Set a certain number of discussions as a completion condition for a for
     And I turn editing mode on
     And I follow "Edit settings"
     And I fill the moodle form with:
-      | Completion tracking | Enabled, control via completion and activity settings |
+      | Enable completion tracking | Yes |
     And I press "Save changes"
     When I add a "Forum" to section "1" and I fill the form with:
       | Forum name | Test forum name |