diff --git a/src/addons/mod/glossary/tests/behat/navigation.feature b/src/addons/mod/glossary/tests/behat/navigation.feature
index 3213a04b2..fb6ac072b 100644
--- a/src/addons/mod/glossary/tests/behat/navigation.feature
+++ b/src/addons/mod/glossary/tests/behat/navigation.feature
@@ -146,11 +146,11 @@ Feature: Test glossary navigation
     When I press the back button in the app
     And I scroll to "Acerola" in the app
     And I press "Search" in the app
-    And I set the field "Search" to "something" in the app
+    And I set the field "Search query" to "something" in the app
     And I press enter
     Then I should find "No entries were found." in the app
 
-    When I set the field "Search" to "melon" in the app
+    When I set the field "Search query" to "melon" in the app
     And I press enter
     Then I should find "Honeydew Melon" in the app
     And I should find "Watermelon" in the app
@@ -266,11 +266,11 @@ Feature: Test glossary navigation
 
     # Search
     When I press "Search" in the app
-    And I set the field "Search" to "something" in the app
+    And I set the field "Search query" to "something" in the app
     And I press enter
     Then I should find "No entries were found." in the app
 
-    When I set the field "Search" to "melon" in the app
+    When I set the field "Search query" to "melon" in the app
     And I press enter
     Then I should find "Honeydew Melon" in the app
     And I should find "Watermelon" in the app
diff --git a/src/addons/mod/quiz/tests/behat/basic_usage.feature b/src/addons/mod/quiz/tests/behat/basic_usage.feature
index d98846609..8d0ce09c9 100755
--- a/src/addons/mod/quiz/tests/behat/basic_usage.feature
+++ b/src/addons/mod/quiz/tests/behat/basic_usage.feature
@@ -156,12 +156,9 @@ Feature: Attempt a quiz in app
     And I press "Next" in the app
     And I press "True" in the app
     And I press "Next" in the app
-    And I press "Choose... , frog" in the app
-    And I press "amphibian" in the app
-    And I press "Choose... , newt" in the app
-    And I press "insect" in the app
-    And I press "Choose... , cat" in the app
-    And I press "mammal" in the app
+    And I set the field "frog" to "amphibian" in the app
+    And I set the field "newt" to "insect" in the app
+    And I set the field "cat" to "mammal" in the app
     And I press "Next" in the app
     Then I should find "Text of the eighth question" in the app