diff --git a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
index aa068197c8c..c6234c9b64a 100644
--- a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
+++ b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
@@ -51,7 +51,7 @@ Feature: In an assignment, teacher can annotate PDF files during grading
     And I log in as "teacher1"
     And I follow "Course 1"
     And I follow "Test assignment name"
-    And I follow "View all submissions"
+    And I click on "View all submissions" "link" in the "Administration" "block"
     And I click on "Edit" "link" in the "Submitted for grading" "table_row"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
     And I should see "Page 1 of 3"
@@ -127,7 +127,7 @@ Feature: In an assignment, teacher can annotate PDF files during grading
     And I log in as "teacher1"
     And I follow "Course 1"
     And I follow "Test assignment name"
-    And I follow "View all submissions"
+    And I click on "View all submissions" "link" in the "Administration" "block"
     And I click on "Edit" "link" in the "Student 2" "table_row"
     And I click on "Grade" "link" in the "Student 2" "table_row"
     And I wait until the page is ready
@@ -138,5 +138,5 @@ Feature: In an assignment, teacher can annotate PDF files during grading
     And I press "Ok"
     And I click on "Edit settings" "link"
     And I follow "Test assignment name"
-    And I follow "View all submissions"
+    And I click on "View all submissions" "link" in the "Administration" "block"
     And I should see "View annotated PDF..." in the "student2@example.com" "table_row"
diff --git a/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature b/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature
index 787bd4e6752..6409f330caf 100644
--- a/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature
+++ b/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature
@@ -49,7 +49,7 @@ Feature: In a group assignment, teacher can annotate PDF files for all users
     And I log in as "teacher1"
     And I follow "Course 1"
     And I follow "Test assignment name"
-    And I follow "View all submissions"
+    And I click on "View all submissions" "link" in the "Administration" "block"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
     And I wait until the page is ready
     And I click on ".navigate-next-button" "css_element"
diff --git a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature
index b35072d9c60..55a66555d52 100644
--- a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature
+++ b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature
@@ -43,7 +43,7 @@ Feature: In an assignment, teacher can view the feedback for a previous attempt.
     And I log in as "teacher1"
     And I follow "Course 1"
     And I follow "Test assignment name"
-    And I follow "View all submissions"
+    And I click on "View all submissions" "link" in the "Administration" "block"
     And I click on "Edit" "link" in the "Submitted for grading" "table_row"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
     And I should see "Page 1 of 3"
diff --git a/mod/assign/tests/behat/allow_another_attempt.feature b/mod/assign/tests/behat/allow_another_attempt.feature
index 3f81e9425f2..62d6530350c 100644
--- a/mod/assign/tests/behat/allow_another_attempt.feature
+++ b/mod/assign/tests/behat/allow_another_attempt.feature
@@ -142,7 +142,7 @@ Feature: In an assignment, students start a new attempt based on their previous
 #    And I log in as "teacher1"
 #    And I follow "Course 1"
 #    And I follow "Test assignment name"
-#    And I follow "View all submissions"
+#    And I click on "View all submissions" "link" in the "Administration" "block"
 #    And "Student 1" row "Status" column of "generaltable" table should contain "Reopened"
 #    And "Student 2" row "Status" column of "generaltable" table should contain "Reopened"
 #    And "Student 3" row "Status" column of "generaltable" table should contain "Submitted for grading"
@@ -164,6 +164,6 @@ Feature: In an assignment, students start a new attempt based on their previous
 #    And I log in as "teacher1"
 #    And I follow "Course 1"
 #    And I follow "Test assignment name"
-#    And I follow "View all submissions"
+#    I click on "View all submissions" "link" in the "Administration" "block"
 #    And I click on "Grade" "link" in the "Student 1" "table_row"
     #And I should see "This is attempt 2 (3 attempts allowed)"