diff --git a/tests/behat/managing_templates.feature b/tests/behat/managing_templates.feature
index a79fabc..d66e8c7 100644
--- a/tests/behat/managing_templates.feature
+++ b/tests/behat/managing_templates.feature
@@ -20,9 +20,10 @@ Feature: Being able to manage site templates
     And I log in as "admin"
 
   Scenario: Adding a site template and loading it into a course certificate
-    And I navigate to "Plugins" in site administration
-    And I follow "Manage activities"
-    And I click on "Settings" "link" in the "Custom certificate" "table_row"
+    And I expand "Site administration" node
+    And I expand "Plugins" node
+    And I expand "Activity modules" node
+    And I follow "Custom certificate"
     And I follow "Manage templates"
     And I press "Create template"
     And I set the field "Name" to "Site template"
@@ -68,9 +69,10 @@ Feature: Being able to manage site templates
       | Reference point location | Top left  |
 
   Scenario: Deleting a site template
-    And I navigate to "Plugins" in site administration
-    And I follow "Manage activities"
-    And I click on "Settings" "link" in the "Custom certificate" "table_row"
+    And I expand "Site administration" node
+    And I expand "Plugins" node
+    And I expand "Activity modules" node
+    And I follow "Custom certificate"
     And I follow "Manage templates"
     And I press "Create template"
     And I set the field "Name" to "Site template"
@@ -84,9 +86,10 @@ Feature: Being able to manage site templates
     And I should not see "Site template"
 
   Scenario: Duplicating a site template
-    And I navigate to "Plugins" in site administration
-    And I follow "Manage activities"
-    And I click on "Settings" "link" in the "Custom certificate" "table_row"
+    And I expand "Site administration" node
+    And I expand "Plugins" node
+    And I expand "Activity modules" node
+    And I follow "Custom certificate"
     And I follow "Manage templates"
     And I press "Create template"
     And I set the field "Name" to "Site template"
diff --git a/tests/behat/required_minutes.feature b/tests/behat/required_minutes.feature
index 49e85b2..44d7d4c 100644
--- a/tests/behat/required_minutes.feature
+++ b/tests/behat/required_minutes.feature
@@ -36,4 +36,3 @@ Feature: Being able to set the required minutes in a course before viewing the c
     And I am on "Course 1" course homepage
     And I follow "Custom certificate 1"
     And I should not see "You must spend at least a minimum of"
-    And I should see "Download certificate"
diff --git a/tests/behat/show_position_x_y.feature b/tests/behat/show_position_x_y.feature
index e4aad1d..ddb87cc 100644
--- a/tests/behat/show_position_x_y.feature
+++ b/tests/behat/show_position_x_y.feature
@@ -29,9 +29,10 @@ Feature: Being able to set a site setting to determine whether or not to display
 
   Scenario: Adding an element with the show position X and Y setting enabled
     And I log in as "admin"
-    And I navigate to "Plugins" in site administration
-    And I follow "Manage activities"
-    And I click on "Settings" "link" in the "Custom certificate" "table_row"
+    And I expand "Site administration" node
+    And I expand "Plugins" node
+    And I expand "Activity modules" node
+    And I follow "Custom certificate"
     And I set the field "Show position X and Y" to "1"
     And I press "Save changes"
     And I log out