diff --git a/lib/tests/behat/behat_navigation.php b/lib/tests/behat/behat_navigation.php
index fe1e47800e5..f3bad4610ba 100644
--- a/lib/tests/behat/behat_navigation.php
+++ b/lib/tests/behat/behat_navigation.php
@@ -46,6 +46,13 @@ class behat_navigation extends behat_base {
      */
     public function i_expand_node($nodetext) {
 
+        // This step is useless with Javascript disabled as Moodle auto expands
+        // all of tree's nodes; adding this because of scenarios that shares the
+        // same steps with and without Javascript enabled.
+        if (!$this->running_javascript()) {
+            return false;
+        }
+
         $xpath = "//ul[contains(concat(' ', normalize-space(@class), ' '), ' block_tree ')]
 /child::li
 /child::p[contains(concat(' ', normalize-space(@class), ' '), ' branch')]
diff --git a/message/tests/behat/manage_contacts.feature b/message/tests/behat/manage_contacts.feature
new file mode 100644
index 00000000000..a8dea48d638
--- /dev/null
+++ b/message/tests/behat/manage_contacts.feature
@@ -0,0 +1,32 @@
+@core_message
+Feature: Manage contacts
+  In order to easily access the users I interact more with
+  As a moodle user
+  I need to add and remove users to/from my contacts list
+
+  Background:
+    Given the following "users" exists:
+      | username | firstname | lastname | email |
+      | user1 | User | One | one@asd.com |
+      | user2 | User | Two | two@asd.com |
+    And I log in as "user1"
+    And I send "Message 1 from user1 to user2" message to "user2"
+    And I send "Message 2 from user1 to user2" message to "user2"
+    And I follow "Messages"
+    And I fill in "Search people and messages" with "User Two"
+    And I press "Search people and messages"
+    When I click on "Add contact" "link" in the "User Two" table row
+    Then I should see "Message 1 from user1 to user2"
+    And I should see "Message 2 from user1 to user2"
+    And I should see "User Two" in the "#message_contacts" "css_element"
+    And I follow "Remove contact"
+    And I should not see "User Two" in the "#message_contacts" "css_element"
+    And I should not see "Remove contact"
+    And I should see "Add contact"
+    And I follow "Add contact"
+    And I should see "User Two" in the "#message_contacts" "css_element"
+
+  @javascript
+  Scenario: Adding and removing contacts with Javascript enabled
+
+  Scenario: Adding and removing contacts with Javascript disabled