diff --git a/user/tests/behat/participants_in_group_modes.feature b/user/tests/behat/participants_in_group_modes.feature
index 4aa4e6717d3..7478aee1b90 100644
--- a/user/tests/behat/participants_in_group_modes.feature
+++ b/user/tests/behat/participants_in_group_modes.feature
@@ -1,8 +1,8 @@
 @core @core_course @javascript
 Feature: Viewing participants page in different group modes
-  In order to view my peers
-  As a student
-  I need to be able to browse participants
+  In order to view my students
+  As a user
+  I need to be able to browse participants who are grouped
 
   Background:
     Given the following "courses" exist:
@@ -12,16 +12,28 @@ Feature: Viewing participants page in different group modes
       | C3 sepgroups | C3        |         | 1         | 0        |
     And the following "users" exist:
       | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+      | teacher2 | Teacher   | 2        | teacher2@example.com |
       | student1 | Student   | 1        | student1@example.com |
       | student2 | Student   | 2        | student2@example.com |
+      | student3 | Student   | 3        | student3@example.com |
     And the following "course enrolments" exist:
       | user     | course | role    |
+      | teacher1 | C1     | editingteacher |
+      | teacher1 | C2     | editingteacher |
+      | teacher1 | C3     | editingteacher |
+      | teacher2 | C1     | teacher |
+      | teacher2 | C2     | teacher |
+      | teacher2 | C3     | teacher |
       | student1 | C1     | student |
       | student1 | C2     | student |
       | student1 | C3     | student |
       | student2 | C1     | student |
       | student2 | C2     | student |
       | student2 | C3     | student |
+      | student3 | C1     | student |
+      | student3 | C2     | student |
+      | student3 | C3     | student |
     And the following "groups" exist:
       | name | course | idnumber |
       | G1   | C2     | C2G1      |
@@ -34,30 +46,141 @@ Feature: Viewing participants page in different group modes
       | student1 | C3G1   |
       | student2 | C2G2   |
       | student2 | C3G2   |
+      | teacher2 | C2G1   |
+      | teacher2 | C3G1   |
 
-  Scenario: Viewing participants page in a course without group mode
+  Scenario: Viewing participants page as an editing teacher in a course without group mode
+    When I log in as "teacher1"
+    And I am on "C1 nogroups" course homepage
+    And I navigate to course participants
+    Then "Student 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Student 2" row "Groups" column of "participants" table should contain "No groups"
+    And "Student 3" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "No groups"
+
+  Scenario: Viewing participants page as an editing teacher in a course in visible groups mode
+    When I log in as "teacher1"
+    And I am on "C2 visgroups" course homepage
+    And I navigate to course participants
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Student 2" row "Groups" column of "participants" table should contain "G2"
+    And "Student 3" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
+
+  Scenario: Viewing participants page as an editing teacher in a course in separate groups mode
+    When I log in as "teacher1"
+    And I am on "C3 sepgroups" course homepage
+    And I navigate to course participants
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Student 2" row "Groups" column of "participants" table should contain "G2"
+    And "Student 3" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
+
+  Scenario: Viewing participants page as a non-editing teacher in a course without group mode
+    When I log in as "teacher2"
+    And I am on "C1 nogroups" course homepage
+    And I navigate to course participants
+    Then "Student 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Student 2" row "Groups" column of "participants" table should contain "No groups"
+    And "Student 3" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "No groups"
+
+  Scenario: Viewing participants page as a non-editing teacher in a course in visible groups mode
+    When I log in as "teacher2"
+    And I am on "C2 visgroups" course homepage
+    And I navigate to course participants
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
+    And I should not see "Teacher 1"
+    And I should not see "Student 2"
+    And I should not see "Student 3"
+
+    When I click on "Clear filters" "button"
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Student 2" row "Groups" column of "participants" table should contain "G2"
+    And "Student 3" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
+
+  Scenario: Viewing participants page as a non-editing teacher in a course in separate groups mode
+    When I log in as "teacher2"
+    And I am on "C3 sepgroups" course homepage
+    And I navigate to course participants
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
+    And I should not see "Teacher 1"
+    And I should not see "Student 2"
+    And I should not see "Student 3"
+
+    When I click on "Clear filters" "button"
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
+    And I should not see "Teacher 1"
+    And I should not see "Student 2"
+    And I should not see "Student 3"
+
+  Scenario: Viewing participants page as a student in a course without group mode
     When I log in as "student1"
     And I am on "C1 nogroups" course homepage
     And I navigate to course participants
     Then "Student 1" row "Groups" column of "participants" table should contain "No groups"
     And "Student 2" row "Groups" column of "participants" table should contain "No groups"
+    And "Student 3" row "Groups" column of "participants" table should contain "No groups"
 
-  Scenario: Viewing participants page in a course in visible groups mode
+  Scenario: Viewing participants page as a student in a group in a course in visible groups mode
     When I log in as "student1"
     And I am on "C2 visgroups" course homepage
     And I navigate to course participants
     Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
     And I should not see "Student 2"
-    And I click on "Clear filters" "button"
-    And "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And I should not see "Student 3"
+    And I should not see "Teacher 1"
+    When I click on "Clear filters" "button"
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
     And "Student 2" row "Groups" column of "participants" table should contain "G2"
+    And "Student 3" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
 
-  Scenario: Viewing participants page in a course in separate groups mode
+  Scenario: Viewing participants page as a student in a group in a course in separate groups mode
     When I log in as "student1"
     And I am on "C3 sepgroups" course homepage
     And I navigate to course participants
     Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
     And I should not see "Student 2"
-    And I click on "Clear filters" "button"
-    And "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And I should not see "Student 3"
+    And I should not see "Teacher 1"
+    When I click on "Clear filters" "button"
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
     And I should not see "Student 2"
+    And I should not see "Student 3"
+    And I should not see "Teacher 1"
+
+  Scenario: Viewing participants page as a student not in a group in a course in visible groups mode
+    When I log in as "student3"
+    And I am on "C2 visgroups" course homepage
+    And I navigate to course participants
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
+    And I should not see "Student 2"
+    And I should not see "Student 3" in the "participants" "table"
+    And I should not see "Teacher 1"
+    When I click on "Clear filters" "button"
+    Then "Student 1" row "Groups" column of "participants" table should contain "G1"
+    And "Student 2" row "Groups" column of "participants" table should contain "G2"
+    And "Student 3" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 1" row "Groups" column of "participants" table should contain "No groups"
+    And "Teacher 2" row "Groups" column of "participants" table should contain "G1"
+
+  Scenario: Viewing participants page as a student not in a group in a course in separate groups mode
+    When I log in as "student3"
+    And I am on "C3 sepgroups" course homepage
+    And I navigate to course participants
+    Then I should see "Sorry, but you need to be part of a group to see this page."