diff --git a/src/addons/mod/assign/tests/behat/basic_usage.feature b/src/addons/mod/assign/tests/behat/basic_usage.feature
index 86cccde78..94bce1779 100755
--- a/src/addons/mod/assign/tests/behat/basic_usage.feature
+++ b/src/addons/mod/assign/tests/behat/basic_usage.feature
@@ -53,7 +53,7 @@ Feature: Test basic usage of assignment activity in app
     Then I should find "Student student" in the app
     And I should find "Not graded" in the app
 
-    When I press "Student student" near "assignment1" in the app
+    When I press "Student student" in the app
     Then I should find "Online text submissions" in the app
     And I should find "Submission test edited" in the app
     And the following events should have been logged for "student1" in the app:
@@ -87,7 +87,7 @@ Feature: Test basic usage of assignment activity in app
     # Allow more attempts as a teacher
     Given I entered the assign activity "assignment1" on course "Course 1" as "teacher1" in the app
     When I press "Participants" in the app
-    And I press "Student student" near "assignment1" in the app
+    And I press "Student student" in the app
     And I press "Grade" in the app
     And I press "Allow another attempt" in the app
     And I press "Done" in the app
@@ -116,7 +116,7 @@ Feature: Test basic usage of assignment activity in app
     Given I entered the assign activity "assignment1" on course "Course 1" as "teacher1" in the app
     When I press "Participants" in the app
     And I pull to refresh in the app
-    And I press "Student student" near "assignment1" in the app
+    And I press "Student student" in the app
     Then I should find "Online text submissions" in the app
     And I should find "Submission test 2nd attempt" in the app
 
diff --git a/src/core/features/mainmenu/tests/behat/mainmenu.feature b/src/core/features/mainmenu/tests/behat/mainmenu.feature
index e1724643c..2a281f2ce 100644
--- a/src/core/features/mainmenu/tests/behat/mainmenu.feature
+++ b/src/core/features/mainmenu/tests/behat/mainmenu.feature
@@ -34,7 +34,7 @@ Feature: Main Menu opens the right page
     Given the following config values are set as admin:
       | defaulthomepage | 3 |
     And I entered the app as "student"
-    Then "My courses" near "Home" should be selected in the app
+    Then "My courses" "ion-tab-button" should be selected in the app
     And I should find "Course 1" in the app
     And "My courses" "text" should appear before "Home" "text" in the ".mainmenu-tabs" "css_element"