diff --git a/course/format/topics/tests/behat/edit_delete_sections.feature b/course/format/topics/tests/behat/edit_delete_sections.feature
index 1e6a7ddf6dc..69e9dfbfe0b 100644
--- a/course/format/topics/tests/behat/edit_delete_sections.feature
+++ b/course/format/topics/tests/behat/edit_delete_sections.feature
@@ -41,15 +41,13 @@ Feature: Sections can be edited and deleted in topics format
     Then I should see "Use default section name [Topic 2]"
 
   Scenario: Edit section summary in topics format
-    When I edit the section "2"
-    And I set the following fields to these values:
+    When I edit the section "2" and I fill the form with:
       | Summary | Welcome to section 2 |
     And I press "Save changes"
     Then I should see "Welcome to section 2" in the "li#section-2" "css_element"
 
   Scenario: Edit section default name in topics format
-    When I edit the section "2"
-    And I set the following fields to these values:
+    When I edit the section "2" and I fill the form with:
       | Use default section name | 0                        |
       | name                     | This is the second topic |
     And I press "Save changes"