diff --git a/mod/quiz/report/grading/tests/behat/grading.feature b/mod/quiz/report/grading/tests/behat/grading.feature
index fc496eb60b8..29a1b302d30 100644
--- a/mod/quiz/report/grading/tests/behat/grading.feature
+++ b/mod/quiz/report/grading/tests/behat/grading.feature
@@ -174,27 +174,24 @@ Feature: Basic use of the Manual grading report
     And quiz "Quiz 2" contains the following questions:
       | question | page |
       | Essay Q1 | 1    |
-    And I log out
     When I am on the "Quiz 2" "mod_quiz > View" page logged in as "student1"
     And I press "Attempt quiz"
-    And I set the field with xpath "//*[contains(concat(' ', @class, ' '), ' editor_atto_content ')]" to "This is my attempt 1"
+    And I set the field "Answer text Question 1" to "This is my attempt 1"
     And I follow "Finish attempt ..."
     And I press "Submit all and finish"
     And I click on "Submit all and finish" "button" in the "Submit all your answers and finish?" "dialogue"
     And I click on "Finish review" "link"
     And I press "Re-attempt quiz"
-    And I set the field with xpath "//*[contains(concat(' ', @class, ' '), ' editor_atto_content ')]" to "This is my attempt 2"
+    And I set the field "Answer text Question 1" to "This is my attempt 2"
     And I follow "Finish attempt ..."
     And I press "Submit all and finish"
     And I click on "Submit all and finish" "button" in the "Submit all your answers and finish?" "dialogue"
     And I click on "Finish review" "link"
     And I press "Re-attempt quiz"
-    And I set the field with xpath "//*[contains(concat(' ', @class, ' '), ' editor_atto_content ')]" to "This is my attempt 3"
+    And I set the field "Answer text Question 1" to "This is my attempt 3"
     And I follow "Finish attempt ..."
     And I press "Submit all and finish"
     And I click on "Submit all and finish" "button" in the "Submit all your answers and finish?" "dialogue"
-    And I log out
-
     And I am on the "Quiz 2" "mod_quiz > Manual grading report" page logged in as "teacher1"
     And I follow "Also show questions that have been graded automatically"
     And I should see "Essay Q1"