diff --git a/mod/comments/tests/behat/app_basic_usage.feature b/mod/comments/tests/behat/app_basic_usage.feature
new file mode 100755
index 000000000..6b7ae1e64
--- /dev/null
+++ b/mod/comments/tests/behat/app_basic_usage.feature
@@ -0,0 +1,155 @@
+@mod @mod_comments @app @javascript
+Feature: Test basic usage of comments in app
+  In order to participate in the comments while using the mobile app
+  As a student
+  I need basic comments functionality to work
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email |
+      | teacher1 | Teacher | teacher | teacher1@example.com |
+      | student1 | Student | student | student1@example.com |
+
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1 | 0 |
+
+    And the following "course enrolments" exist:
+      | user | course | role |
+      | teacher1 | C1 | editingteacher |
+      | student1 | C1 | student |
+
+    And the following "activities" exist:
+      | activity | name          | intro                | course | idnumber  | mainglossary | allowcomments | assessed   | scale |
+      | glossary | Test glossary | glossary description | C1     | gloss1    | 1            | 1             | 1          | 1     |
+
+    And the following "activities" exist:
+      | activity | name      | intro        | course | idnumber | comments |
+      | data     | Data      | Data info    | C1     | data1    | 1        |
+
+
+  @app @3.8.0 @OK
+  Scenario: Add comments and delete comments (database)
+  When I enter the app
+  And I log in as "teacher1"
+  Then the header should be "Acceptance test site" in the app 
+  And I should see "Course 1"
+  And I press "Course 1" near "Recently accessed courses" in the app
+  And I press "Data" in the app
+  And I press "Display options" in the app
+  And I press "Open in browser" in the app
+  And I switch to the browser tab opened by the app
+  And I log in as "teacher1"
+  And I add a "Text input" field to "Data" database and I fill the form with:
+      | Field name | Test field name |
+      | Field description | Test field description |
+  And I press "Save"
+  And I close the browser tab opened by the app
+  When I enter the app
+  And I log in as "teacher1"
+  Then the header should be "Acceptance test site" in the app 
+  And I should see "Course 1"
+  And I press "Course 1" near "Recently accessed courses" in the app
+  And I press "Data" in the app
+  And I press "add" in the app
+  And I set the field "Test field name" to "Test" in the app
+  And I press "Save" in the app
+  And I press "More" in the app
+  And I press "Comments (0)" in the app
+  And I press "close" in the app
+  And I set the field "Add a comment..." to "comment test" in the app
+  And I press "Save comment" in the app
+  Then I should see "Comment created"
+  And I should see "comment test"
+  And I press the back button in the app
+  And I should see "Comments (1)"
+  When I enter the app
+  And I log in as "student1"
+  Then the header should be "Acceptance test site" in the app 
+  And I should see "Course 1"
+  And I press "Course 1" near "Recently accessed courses" in the app
+  And I press "Data" in the app
+  And I press "More" in the app
+  And I press "Comments (1)" in the app
+  And I press "close" in the app
+  And I set the field "Add a comment..." to "comment test student" in the app
+  And I press "Save comment" in the app
+  Then I should see "Comment created"
+  And I should see "comment test"
+  And I should see "comment test student"
+  And I press the back button in the app
+  And I should see "Comments (2)"
+  And I press "Comments (2)" in the app
+  And I press "Delete" in the app
+  And I press "trash" in the app
+  And I press "Delete" near "Cancel" in the app
+  Then I should see "Comment deleted"
+  And I should see "comment test"
+  And I should not see "comment test student"
+  And I press the back button in the app
+  And I should see "Comments (1)"
+
+  @app @3.8.0 @OK
+  Scenario: Add comments offline, delete comments offline and sync (database)
+  When I enter the app
+  And I log in as "teacher1"
+  Then the header should be "Acceptance test site" in the app 
+  And I should see "Course 1"
+  And I press "Course 1" near "Recently accessed courses" in the app
+  And I press "Data" in the app
+  And I press "Display options" in the app
+  And I press "Open in browser" in the app
+  And I switch to the browser tab opened by the app
+  And I log in as "teacher1"
+  And I add a "Text input" field to "Data" database and I fill the form with:
+      | Field name | Test field name |
+      | Field description | Test field description |
+  And I press "Save"
+  And I close the browser tab opened by the app
+  When I enter the app
+  And I log in as "teacher1"
+  Then the header should be "Acceptance test site" in the app 
+  And I should see "Course 1"
+  And I press "Course 1" near "Recently accessed courses" in the app
+  And I press "Data" in the app
+  And I press "add" in the app
+  And I set the field "Test field name" to "Test" in the app
+  And I press "Save" in the app
+  And I press "More" in the app
+  And I press "Comments (0)" in the app
+  And I switch offline mode to "true"
+  And I press "close" in the app
+  And I set the field "Add a comment..." to "comment test" in the app
+  And I press "Save comment" in the app
+  Then I should see "Data stored in the device because it couldn't be sent. It will be sent automatically later."
+  And I should see "There are offline comments to be synchronised."
+  And I should see "comment test"
+  And I press the back button in the app
+  And I should see "Comments (0)"
+  And I press "Comments (0)" in the app
+  And I switch offline mode to "false"
+  And I press "Display options" in the app
+  And I press "Synchronise now" in the app
+  Then I should not see "There are offline comments to be synchronised."
+  And I should see "comment test"
+  And I press the back button in the app
+  And I should see "Comments (1)"
+  And I press "Comments (1)" in the app
+  And I switch offline mode to "true"
+  And I press "Delete" in the app
+  And I press "trash" in the app
+  And I press "Delete" near "Cancel" in the app
+  Then I should see "Comment deleted"
+  And I should see "There are offline comments to be synchronised."
+  And I should see "Deleted offline"
+  And I should see "comment test"
+  And I press the back button in the app
+  And I should see "Comments (1)"
+  And I press "Comments (1)" in the app
+  And I switch offline mode to "false"
+  And I press "Display options" in the app
+  And I press "Synchronise now" in the app
+  Then I should not see "There are offline comments to be synchronised."
+  And I should not see "comment test"
+  And I press the back button in the app
+  And I should see "Comments (0)"
\ No newline at end of file