diff --git a/group/tests/behat/group_description_picture.feature b/group/tests/behat/group_description_picture.feature
index 14298dcda4b..64b2d9e5cc4 100644
--- a/group/tests/behat/group_description_picture.feature
+++ b/group/tests/behat/group_description_picture.feature
@@ -21,9 +21,7 @@ Feature: The description and picture of a group can be viewed by students and te
 
   @javascript @_file_upload
   Scenario: A student can see the group description and picture when visible groups are set. Teachers can see group details.
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I navigate to "Settings" in current page administration
+    Given I am on the "Course 1" "course editing" page logged in as "teacher1"
     And I set the following fields to these values:
       | Group mode | Visible groups |
     And I press "Save and display"
@@ -41,7 +39,6 @@ Feature: The description and picture of a group can be viewed by students and te
     And I press "Save changes"
     And I add "Student 1 (student1@example.com)" user to "Group A" group members
     And I add "Student 2 (student2@example.com)" user to "Group B" group members
-    And I am on "Course 1" course homepage
     And I navigate to course participants
     And I click on "Student 1" "link" in the "participants" "table"
     And I click on "Group A" "link"
@@ -56,18 +53,14 @@ Feature: The description and picture of a group can be viewed by students and te
     And I click on "Group B" "link"
     And I should see "Student 2" in the "participants" "table"
     And ".groupinfobox" "css_element" should not exist
-    And I log out
-    When I log in as "student1"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student1
     And I navigate to course participants
     And I click on "Student 1" "link" in the "participants" "table"
     And I click on "Group A" "link"
     # As student, confirm that group description and picture is displayed
     Then I should see "Description for Group A"
     And "//img[@class='grouppicture']" "xpath_element" should exist
-    And I log out
-    And I log in as "student2"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as student2
     And I navigate to course participants
     And I click on "Student 2" "link" in the "participants" "table"
     And I click on "Group B" "link"
@@ -76,9 +69,7 @@ Feature: The description and picture of a group can be viewed by students and te
 
   @javascript @_file_upload
   Scenario: A student can not see the group description and picture when separate groups are set. Teachers can see group details.
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I navigate to "Settings" in current page administration
+    Given I am on the "Course 1" "course editing" page logged in as "teacher1"
     And I set the following fields to these values:
       | Group mode | Separate groups |
     And I press "Save and display"
@@ -96,7 +87,6 @@ Feature: The description and picture of a group can be viewed by students and te
     And I press "Save changes"
     And I add "Student 1 (student1@example.com)" user to "Group A" group members
     And I add "Student 2 (student2@example.com)" user to "Group B" group members
-    And I am on "Course 1" course homepage
     And I navigate to course participants
     And I click on "Student 1" "link" in the "participants" "table"
     And I click on "Group A" "link"
@@ -110,9 +100,7 @@ Feature: The description and picture of a group can be viewed by students and te
     And I click on "Student 2" "link" in the "participants" "table"
     And I click on "Group B" "link"
     And ".groupinfobox" "css_element" should not exist
-    And I log out
-    When I log in as "student1"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student1
     And I navigate to course participants
     And I click on "Student 1" "link" in the "participants" "table"
     And I click on "Group A" "link"
@@ -121,9 +109,7 @@ Feature: The description and picture of a group can be viewed by students and te
     Then I should not see "Description for Group A"
     And "//img[@class='grouppicture']" "xpath_element" should not exist
     And ".groupinfobox" "css_element" should not exist
-    And I log out
-    And I log in as "student2"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student2
     And I navigate to course participants
     And I click on "Student 2" "link" in the "participants" "table"
     And I click on "Group B" "link"