diff --git a/mod/assign/tests/behat/submission_comments.feature b/mod/assign/tests/behat/submission_comments.feature
index eb017567a1d..7bcb5e60a0f 100644
--- a/mod/assign/tests/behat/submission_comments.feature
+++ b/mod/assign/tests/behat/submission_comments.feature
@@ -4,18 +4,22 @@ Feature: In an assignment, students can comment in their submissions
   As a student
   I need to add comments about submissions
 
-  @javascript
-  Scenario: Student comments an assignment submission
+  Background:
     Given the following "courses" exist:
       | fullname | shortname | category | groupmode |
       | Course 1 | C1 | 0 | 1 |
     And the following "users" exist:
       | username | firstname | lastname | email |
+      | teacher1 | Teacher | 1 | teacher1@asd.com |
       | student1 | Student | 1 | student1@asd.com |
     And the following "course enrolments" exist:
       | user | course | role |
+      | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
-    And the following "activities" exist:
+
+  @javascript
+  Scenario: Student comments an assignment submission
+    Given the following "activities" exist:
       | activity | course | idnumber | name                 | intro                       | assignsubmission_onlinetext_enabled |
       | assign   | C1     | assign1  | Test assignment name | Test assignment description | 1 |
     And I log in as "student1"
@@ -39,3 +43,21 @@ Feature: In an assignment, students can comment in their submissions
     And I click on ".comment-link" "css_element"
     And I should see "Second student comment"
     And I should not see "First student comment"
+
+  @javascript
+  Scenario: Teacher can comment on an offline assignment
+    Given the following "activities" exist:
+      | activity | course | idnumber | name                 | intro                       | assignsubmission_onlinetext_enabled | assignmentsubmission_file_enabled | assignfeedback_comments_enabled |
+      | assign   | C1     | assign1  | Test assignment name | Test assignment description | 0 | 0 | 1 |
+    And I log in as "teacher1"
+    And I follow "Course 1"
+    And I follow "Test assignment name"
+    And I follow "View/grade all submissions"
+    And I click on "Grade Student 1" "link" in the "Student 1" "table_row"
+    When I set the following fields to these values:
+      | Grade out of 100 | 50 |
+      | Feedback comments | I'm the teacher feedback |
+    And I press "Save changes"
+    And I press "Continue"
+    Then I should see "50.00" in the "Student 1" "table_row"
+    And I should see "I'm the teacher feedback" in the "Student 1" "table_row"