diff --git a/blocks/participants/tests/behat/block_participants_course.feature b/blocks/participants/tests/behat/block_participants_course.feature
index a850602f66f..5fa4a0bb502 100644
--- a/blocks/participants/tests/behat/block_participants_course.feature
+++ b/blocks/participants/tests/behat/block_participants_course.feature
@@ -29,7 +29,7 @@ Feature: People Block used in a course
     When I log in as "student1"
     And I am on "Course 1" course homepage
     And I click on "Participants" "link" in the "People" "block"
-    Then I should see "All participants" in the "#page-content" "css_element"
+    Then I should see "Participants" in the "#page-content" "css_element"
 
   Scenario: Student without permission can not view participants link
     Given the following "permission overrides" exist:
diff --git a/course/tests/behat/rename_roles.feature b/course/tests/behat/rename_roles.feature
index c16ead45273..8c8a5e8a5a3 100644
--- a/course/tests/behat/rename_roles.feature
+++ b/course/tests/behat/rename_roles.feature
@@ -30,9 +30,10 @@ Feature: Rename roles within a course
     Then "Tutor" "button" should exist
     And "Learner" "button" should exist
     And I navigate to course participants
-    And the "roleid" select box should contain "Tutor"
-    And the "roleid" select box should contain "Learner"
-    And the "roleid" select box should not contain "Student"
+    And I open the autocomplete suggestions list
+    And I should see "Role: Tutor" in the ".form-autocomplete-suggestions" "css_element"
+    And I should see "Role: Learner" in the ".form-autocomplete-suggestions" "css_element"
+    And I should not see "Role: Student" in the ".form-autocomplete-suggestions" "css_element"
     And I am on "Course 1" course homepage
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -44,5 +45,6 @@ Feature: Rename roles within a course
     And "Student" "button" should exist
     And "Learner" "button" should not exist
     And I navigate to course participants
-    And the "roleid" select box should contain "Non-editing teacher"
-    And the "roleid" select box should contain "Student"
+    And I open the autocomplete suggestions list
+    And I should see "Role: Non-editing teacher" in the ".form-autocomplete-suggestions" "css_element"
+    And I should see "Role: Student" in the ".form-autocomplete-suggestions" "css_element"
diff --git a/group/tests/behat/create_groups.feature b/group/tests/behat/create_groups.feature
index 4642d4d5f36..aa11ab9ae95 100644
--- a/group/tests/behat/create_groups.feature
+++ b/group/tests/behat/create_groups.feature
@@ -47,11 +47,16 @@ Feature: Organize students into groups
     And the "members" select box should contain "Student 3"
     And the "members" select box should not contain "Student 0"
     And I navigate to course participants
-    And I set the field "Separate groups" to "Group 1"
+    And I open the autocomplete suggestions list
+    And I click on "Group: Group 1" item in the autocomplete list
+    And I press "Filter"
     And I should see "Student 0"
     And I should see "Student 1"
     And I should not see "Student 2"
-    And I set the field "Separate groups" to "Group 2"
+    And I click on "Group: Group 1" "text" in the ".form-autocomplete-selection" "css_element"
+    And I open the autocomplete suggestions list
+    And I click on "Group: Group 2" item in the autocomplete list
+    And I press "Filter"
     And I should see "Student 2"
     And I should see "Student 3"
     And I should not see "Student 0"