diff --git a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
index 1b09bbeb6c8..6e4a8d085d4 100644
--- a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
+++ b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
@@ -19,12 +19,7 @@ Feature: In an assignment, teacher can annotate PDF files during grading
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
     And I log in as "admin"
-    And I expand "Site administration" node
-    And I expand "Plugins" node
-    And I expand "Activity modules" node
-    And I expand "Assignment" node
-    And I expand "Feedback plugins" node
-    And I follow "Annotate PDF"
+    And I navigate to "Annotate PDF" node in "Site administration > Plugins > Activity modules > Assignment > Feedback plugins"
     And I upload "pix/help.png" file to "" filemanager
     And I upload "pix/docs.png" file to "" filemanager
     When I press "Save changes"
@@ -58,11 +53,14 @@ Feature: In an assignment, teacher can annotate PDF files during grading
     And I follow "View/grade all submissions"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
     And I follow "Launch PDF editor..."
+    And I change window size to "large"
     And I click on ".navigate-next-button" "css_element"
     And I click on ".stampbutton" "css_element"
     And I click on ".linebutton" "css_element"
     And I click on ".commentcolourbutton" "css_element"
     And I click on "//img[@alt=\"Blue\"]" "xpath_element"
+    And I change window size to "medium"
+    And I wait until the page is ready
     And I click on "Close" "button"
     And I press "Save changes"
     And I should see "The grade changes were saved"
@@ -133,6 +131,8 @@ Feature: In an assignment, teacher can annotate PDF files during grading
     And I follow "Launch PDF editor..."
     And I click on ".stampbutton" "css_element"
     And I click on ".drawingcanvas" "css_element"
+    And I change window size to "medium"
+    And I wait until the page is ready
     And I click on "Close" "button"
     And I press "Save changes"
     And I should see "The grade changes were saved"
diff --git a/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature b/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature
index 56b26de5322..a5296fb5ee0 100644
--- a/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature
+++ b/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature
@@ -66,7 +66,10 @@ Feature: In a group assignment, teacher can annotate PDF files for all users
     And I follow "Course 1"
     And I follow "Test assignment name"
     When I follow "View annotated PDF..."
+    And I change window size to "large"
     Then I should see "Annotate PDF"
+    And I change window size to "medium"
+    And I wait until the page is ready
     And I click on "Close" "button"
     And I log out
     And I log in as "student2"