diff --git a/mod/quiz/tests/behat/add_quiz.feature b/mod/quiz/tests/behat/add_quiz.feature
index 152ae6497c9..85bb5c6a5eb 100644
--- a/mod/quiz/tests/behat/add_quiz.feature
+++ b/mod/quiz/tests/behat/add_quiz.feature
@@ -40,7 +40,10 @@ Feature: Add a quiz
     And I press "Next"
     And I should see "Answer saved"
     And I press "Submit all and finish"
-    And I press "Submit all and finish"
+
+  @javascript
+  Scenario: Add and configure small quiz and perform an attempt as a student with Javascript enabled
+    Then I click on "Submit all and finish" "button" in the "Confirmation" "dialogue"
     And I should see "So you think it is true"
     And I should see "Thank you, this is the general feedback"
     And I should see "The correct answer is 'False'."
@@ -48,5 +51,10 @@ Feature: Add a quiz
     And I should see "Highest grade: 0.00 / 10.00."
     And I log out
 
-  @javascript
-  Scenario: Add and configure small quiz and perform an attempt as a student with Javascript enabled
+  Scenario: Add and configure small quiz and perform an attempt as a student with Javascript disabled
+    Then I should see "So you think it is true"
+    And I should see "Thank you, this is the general feedback"
+    And I should see "The correct answer is 'False'."
+    And I follow "Finish review"
+    And I should see "Highest grade: 0.00 / 10.00."
+    And I log out