diff --git a/grade/grading/form/guide/tests/behat/assign_marking_guide.feature b/grade/grading/form/guide/tests/behat/assign_marking_guide.feature
index 3e5ad73b704..9336cd303b8 100644
--- a/grade/grading/form/guide/tests/behat/assign_marking_guide.feature
+++ b/grade/grading/form/guide/tests/behat/assign_marking_guide.feature
@@ -70,3 +70,31 @@ Feature: Display marking guide information to students
       | criteria         | description                      | remark          | maxscore | criteriascore |
       | Grade Criteria 1 | Grade 1 description for students | Excellent work! | 70       | 50 / 70       |
       | Grade Criteria 2 | Grade 2 description for students | Try harder      | 30       | 20 / 30       |
+
+  Scenario: Confirm that marking guide definition is retained when grading method is changed
+    Given I am on the "Assign 1" "assign activity" page
+    And I go to "Student 1" "Assign 1" activity advanced grading page
+    And I grade by filling the marking guide with:
+      | Grade Criteria 1 | 70 | Well done! |
+      | Grade Criteria 2 | 20 | Great work |
+    And I press "Save changes"
+    And I am on the "Assign 1" "assign activity editing" page
+    And I set the following fields to these values:
+      | Grading method | Simple direct grading |
+    And I press "Save and return to course"
+    When I go to "Assign 1" advanced grading page
+    Then I should not see "Assign 1 marking guide Ready for use"
+    And I should not see "Grade Critera 1"
+    And I should not see "Grade Critera 2"
+    And I am on the "Course 1" "grades > Grader report > View" page
+    And the following should exist in the "user-grades" table:
+      | -1-       | -1-                  | -3- |
+      | Student 1 | student1@example.com | 90  |
+    And I am on the "Assign 1" "assign activity editing" page
+    And I set the following fields to these values:
+      | Grading method | Marking guide |
+    And I press "Save and return to course"
+    And I go to "Assign 1" advanced grading page
+    And I should see "Assign 1 marking guide Ready for use"
+    And I should see "Grade Criteria 1"
+    And I should see "Grade Criteria 2"
diff --git a/grade/grading/form/guide/tests/behat/delete_marking_guide.feature b/grade/grading/form/guide/tests/behat/delete_marking_guide.feature
index a5e7b052576..06abc20e352 100644
--- a/grade/grading/form/guide/tests/behat/delete_marking_guide.feature
+++ b/grade/grading/form/guide/tests/behat/delete_marking_guide.feature
@@ -7,12 +7,14 @@ Feature: Teacher can delete marking guide
     Given the following "users" exist:
       | username | firstname | lastname | email                |
       | teacher1 | Teacher   | One      | teacher1@example.com |
+      | student1 | Student   | One      | student1@example.com |
     And the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1        | topics |
     And the following "course enrolments" exist:
       | user     | course | role           |
       | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
     And the following "activities" exist:
       | activity | course | name     | advancedgradingmethod_submissions |
       | assign   | C1     | Assign 1 | guide                             |
@@ -25,13 +27,19 @@ Feature: Teacher can delete marking guide
       | Criterion 1       | Criterion 1 description for student | Criterion 1 description for markers | 100           |
     And I press "Save marking guide and make it ready"
 
+  @javascript
   Scenario: Delete a marking guide
-    Given I am on the "Course 1" course page
+    Given I am on the "Assign 1" "assign activity" page
+    And I go to "Student One" "Assign 1" activity advanced grading page
+    And I grade by filling the marking guide with:
+      | Criterion 1 | 70 | Well done! |
+    And I press "Save changes"
     And I go to "Assign 1" advanced grading page
     When I click on "Delete the currently defined form" "link"
+    Then I should see "You are going to delete the grading form 'Marking guide 1' and all the associated information from 'Assign 1 (Submissions)'"
     And I press "Cancel"
     # Confirm that marking guide was not deleted if Cancel is pressed
-    Then I should see "Marking guide 1 Ready for use"
+    And I should see "Marking guide 1 Ready for use"
     And I should see "Criterion 1"
     And I click on "Delete the currently defined form" "link"
     And I press "Continue"
@@ -39,3 +47,7 @@ Feature: Teacher can delete marking guide
     And I should see "Please note: the advanced grading form is not ready at the moment. Simple grading method will be used until the form has a valid status."
     And I should not see "Marking guide 1 Ready for use"
     And I should not see "Criterion 1"
+    And I am on the "Course 1" "grades > Grader report > View" page
+    And the following should exist in the "user-grades" table:
+      | -1-         | -1-                  | -3- |
+      | Student One | student1@example.com | 70  |