diff --git a/mod/messages/tests/behat/app_basic_usage.feature b/mod/messages/tests/behat/app_basic_usage.feature
index 9d373037d..666938df7 100755
--- a/mod/messages/tests/behat/app_basic_usage.feature
+++ b/mod/messages/tests/behat/app_basic_usage.feature
@@ -2,7 +2,7 @@
 Feature: Test basic usage of messages in app
   In order to participate with messages while using the mobile app
   As a student
-  I need basic messages functionality to work
+  I need basic message functionality to work
 
   Background:
     Given the following "users" exist:
@@ -310,4 +310,33 @@ Feature: Test basic usage of messages in app
   And I press "Messages" in the app
   And I press "Teacher teacher" in the app
   Then I should see "heeey student"
-  And I should see "byee"
\ No newline at end of file
+  And I should see "byee"
+
+  @app @3.8.0 @OK
+  Scenario: Search for messages
+  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 "Messages" in the app
+  And I press "addon.messages.search" in the app
+  And I set the field "Search" to "student1" in the app
+  And I press "search" in the app
+  And I press "Student1 student1" in the app
+  And I set the field "New message" to "test message" in the app
+  And I press "Send" in the app
+  And I set the field "New message" to "search this message" in the app
+  And I press "Send" in the app
+  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 "Messages" in the app
+  And I press "addon.messages.search" in the app
+  And I set the field "Search" to "search this message" in the app
+  And I press "search" in the app
+  Then I should see "Messages"
+  And I should see "search this message"
+  And I press "search this message" near "Teacher teacher" in the app
+  Then I should see "test message"
+  And I should see "search this message"
\ No newline at end of file