diff --git a/mod/quiz/tests/behat/editing_add.feature b/mod/quiz/tests/behat/editing_add.feature
index 1e34c43ead4..dd258669bf0 100644
--- a/mod/quiz/tests/behat/editing_add.feature
+++ b/mod/quiz/tests/behat/editing_add.feature
@@ -99,8 +99,7 @@ Feature: Edit quiz page - adding things
       in various categories and add them to the question bank.
 
     # Create a couple of sub categories.
-    When I am on "Course 1" course homepage
-    And I navigate to "Question bank" in current page administration
+    When I am on the "Course 1" "core_question > course question bank" page
     And I select "Categories" from the "Question bank tertiary navigation" singleselect
     Then I should see "Add category"
     And I follow "Add category"
diff --git a/mod/quiz/tests/behat/editing_add_from_question_bank.feature b/mod/quiz/tests/behat/editing_add_from_question_bank.feature
index f1b4111c69e..bc3be4b4963 100644
--- a/mod/quiz/tests/behat/editing_add_from_question_bank.feature
+++ b/mod/quiz/tests/behat/editing_add_from_question_bank.feature
@@ -26,10 +26,7 @@ Feature: Adding questions to a quiz from the question bank
       | Test questions   | essay     | question 02 name | teacher1 | Question 02 text | qidnum   |
 
   Scenario: The questions can be filtered by tag
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    When I navigate to "Question bank" in current page administration
-    And I choose "Edit question" action for "question 01 name" in the question bank
+    Given I am on the "question 01 name" "core_question > edit" page logged in as teacher1
     And I set the following fields to these values:
       | Tags | foo |
     And I press "id_submitbutton"
@@ -37,7 +34,7 @@ Feature: Adding questions to a quiz from the question bank
     And I set the following fields to these values:
       | Tags | bar |
     And I press "id_submitbutton"
-    And I am on the "Quiz 1" "mod_quiz > Edit" page
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I open the "last" add to quiz menu
     And I follow "from question bank"
     Then I should see "foo" in the "question 01 name" "table_row"