diff --git a/mod/workshop/tests/behat/behat_mod_workshop.php b/mod/workshop/tests/behat/behat_mod_workshop.php
index 63c69976084..4ff5d28b4cf 100644
--- a/mod/workshop/tests/behat/behat_mod_workshop.php
+++ b/mod/workshop/tests/behat/behat_mod_workshop.php
@@ -75,7 +75,7 @@ class behat_mod_workshop extends behat_base {
         return array(
             new Given("I follow \"$workshopname\""),
             new Given("I click on \"$xpath\" \"xpath_element\""),
-            new Given("I fill the moodle form with:", $table),
+            new Given("I set the following fields to these values:", $table),
             new Given("I press \"$savechanges\""),
         );
     }
@@ -94,7 +94,7 @@ class behat_mod_workshop extends behat_base {
         return array(
             new Given("I follow \"$workshopname\""),
             new Given("I follow \"$editassessmentform\""),
-            new Given("I fill the moodle form with:", $table),
+            new Given("I set the following fields to these values:", $table),
             new Given("I press \"$saveandclose\""),
         );
     }
@@ -117,7 +117,7 @@ class behat_mod_workshop extends behat_base {
         return array(
             new Given("I follow \"$workshopname\""),
             new Given("I click on \"$assess\" \"button\" in the \"$xpath\" \"xpath_element\""),
-            new Given("I fill the moodle form with:", $table),
+            new Given("I set the following fields to these values:", $table),
             new Given("I press \"$saveandclose\""),
         );
     }
diff --git a/mod/workshop/tests/behat/workshop_assessment.feature b/mod/workshop/tests/behat/workshop_assessment.feature
index 55b1c8d6228..5546a3eb559 100644
--- a/mod/workshop/tests/behat/workshop_assessment.feature
+++ b/mod/workshop/tests/behat/workshop_assessment.feature
@@ -128,7 +128,7 @@ Feature: Workshop submission and assessment
     And I should see "Amazing" in the "//fieldset[contains(.,'Aspect2')]" "xpath_element"
     And I should see "Good work" in the ".overallfeedback" "css_element"
 # teacher1 assesses the work on submission1 and assesses the assessment of peer
-    And I fill the moodle form with:
+    And I set the following fields to these values:
       | Override grade for assessment | 11 |
       | Feedback for the reviewer     |    |
     And I press "Save and close"
@@ -136,7 +136,7 @@ Feature: Workshop submission and assessment
     And I follow "Submission1"
     And I should see "Grade: 52 of 80" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' assessment-full ') and contains(.,'Sam2')]" "xpath_element"
     And I press "Assess"
-    And I fill the moodle form with:
+    And I set the following fields to these values:
       | grade__idx_0            | 1 / 10                      |
       | peercomment__idx_0      | Extremely bad               |
       | grade__idx_1            | 2 / 10                      |