diff --git a/public/mod/assign/tests/behat/edit_student_submission.feature b/public/mod/assign/tests/behat/edit_student_submission.feature
index f45ce0c2101..4d9643ddd7f 100644
--- a/public/mod/assign/tests/behat/edit_student_submission.feature
+++ b/public/mod/assign/tests/behat/edit_student_submission.feature
@@ -1,37 +1,40 @@
-@mod @mod_assign @javascript
+@mod @mod_assign
 Feature: In an assignment, the administrator can edit students' submissions
   In order to edit a student's submissions
-  As an administrator
+  As an administrator or teacher with the right permissions
   I need to grade multiple students on one page
 
-  Scenario: Editing a student's submission
+  Background:
     Given the following "courses" exist:
       | fullname | shortname | category | groupmode |
-      | Course 1 | C1 | 0 | 1 |
+      | Course 1 | C1        | 0        | 1         |
     And the following "users" exist:
-      | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@example.com |
+      | username | firstname | lastname | email                |
+      | student1 | Student   | 1        | student1@example.com |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
     And the following "course enrolments" exist:
-      | user | course | role |
-      | student1 | C1 | student |
+      | user     | course | role           |
+      | student1 | C1     | student        |
+      | teacher1 | C1     | editingteacher |
     And the following "activity" exists:
       | activity                            | assign                  |
       | course                              | C1                      |
       | name                                | Test assignment name    |
-      | intro                               | Submit your online text |
       | submissiondrafts                    | 0                       |
       | assignsubmission_onlinetext_enabled | 1                       |
     And the following "mod_assign > submissions" exist:
       | assign                | user      | onlinetext                   |
       | Test assignment name  | student1  | I'm the student1 submission  |
 
-    And I am on the "Test assignment name" Activity page logged in as admin
+  @javascript
+  Scenario: Admin can edit a submission
+    Given I am on the "Test assignment name" Activity page logged in as admin
     And I navigate to "Submissions" in current page administration
     And I change window size to "large"
     And I open the action menu in "Student 1" "table_row"
     And I change window size to "medium"
     And I choose "Edit submission" in the open action menu
-    And I set the following fields to these values:
+    When I set the following fields to these values:
       | Online text | Have you seen the movie Chef? |
     And I press "Save changes"
     Then I should see "Have you seen the movie Chef?"
@@ -40,4 +43,30 @@ Feature: In an assignment, the administrator can edit students' submissions
     And I set the following fields to these values:
       | Online text | I have seen the movie chef. |
     And I press "Save changes"
-    Then I should see "I have seen the movie chef."
+    And I should see "I have seen the movie chef."
+
+  @javascript
+  Scenario: Teacher can edit a submission when granted the necessary permissions
+    Given the following "permission overrides" exist:
+      | capability                     | permission | role           | contextlevel | reference |
+      | mod/assign:editothersubmission | Allow      | editingteacher | Course       | C1        |
+    And I am on the "Test assignment name" Activity page logged in as teacher1
+    And I navigate to "Submissions" in current page administration
+    And I open the action menu in "Student 1" "table_row"
+    And I choose "Edit submission" in the open action menu
+    When I set the following fields to these values:
+      | Online text | Have you seen the movie Chef? |
+    And I press "Save changes"
+    Then I should see "Have you seen the movie Chef?"
+    And I open the action menu in "Student 1" "table_row"
+    And I choose "Edit submission" in the open action menu
+    And I set the following fields to these values:
+      | Online text | I have seen the movie chef. |
+    And I press "Save changes"
+    And I should see "I have seen the movie chef."
+
+  Scenario: Teacher cannot edit a submission
+    Given I am on the "Test assignment name" Activity page logged in as teacher1
+    And I navigate to "Submissions" in current page administration
+    When I open the action menu in "Student 1" "table_row"
+    Then I should not see "Edit Submission"