diff --git a/completion/tests/behat/default_activity_completion.feature b/completion/tests/behat/default_activity_completion.feature
index 212b5305d6b..86790234873 100644
--- a/completion/tests/behat/default_activity_completion.feature
+++ b/completion/tests/behat/default_activity_completion.feature
@@ -6,8 +6,8 @@ Feature: Allow teachers to edit the default activity completion rules in a cours
 
   Background:
     Given the following "courses" exist:
-      | fullname | shortname | category | enablecompletion |
-      | Course 1 | C1        | 0        | 1                |
+      | fullname | shortname | category | enablecompletion | numsections |
+      | Course 1 | C1        | 0        | 1                | 1           |
     And the following "users" exist:
       | username | firstname | lastname | email |
       | teacher1 | Teacher | First | teacher1@example.com |
@@ -43,7 +43,7 @@ Feature: Allow teachers to edit the default activity completion rules in a cours
       | completionview_assign     | 0 |
     And I click on "Save changes" "button" in the "[data-region='activitycompletion-assign']" "css_element"
     And I am on "Course 1" course homepage with editing mode on
-    And I press "Add an activity or resource"
+    And I click on "Add an activity or resource" "button" in the "New section" "section"
     And I click on "Add a new Assignment" "link" in the "Add an activity or resource" "dialogue"
     And I expand all fieldsets
     # Completion tracking 2 = Add requirements.
@@ -83,7 +83,7 @@ Feature: Allow teachers to edit the default activity completion rules in a cours
     And I click on "Save changes" "button" in the "[data-region='activitycompletion-forum']" "css_element"
     Then I should see "Changes saved"
     And I am on "Course 1" course homepage with editing mode on
-    And I press "Add an activity or resource"
+    And I click on "Add an activity or resource" "button" in the "New section" "section"
     And I click on "Add a new Forum" "link" in the "Add an activity or resource" "dialogue"
     And I expand all fieldsets
     # Completion tracking 2 = Add requirements.
@@ -122,7 +122,7 @@ Feature: Allow teachers to edit the default activity completion rules in a cours
     And I click on "Save changes" "button" in the "[data-region='activitycompletion-glossary']" "css_element"
     Then I should see "Changes saved"
     And I am on "Course 1" course homepage with editing mode on
-    And I press "Add an activity or resource"
+    And I click on "Add an activity or resource" "button" in the "New section" "section"
     And I click on "Add a new Glossary" "link" in the "Add an activity or resource" "dialogue"
     And I expand all fieldsets
     # Completion tracking 2 = Add requirements.
diff --git a/mod/lti/tests/behat/managecoursetools.feature b/mod/lti/tests/behat/managecoursetools.feature
index 0815b49b029..6a1fb22a552 100644
--- a/mod/lti/tests/behat/managecoursetools.feature
+++ b/mod/lti/tests/behat/managecoursetools.feature
@@ -279,7 +279,7 @@ Feature: Manage course tools
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Restored course |
     And I should see "Restored course"
-    And I click on "Add an activity or resource" "button" in the "New section" "section"
+    And I click on "Add an activity or resource" "button" in the "General" "section"
     Then I should not see "Teaching Tool 1" in the ".modal-body" "css_element"
     And I should see "Teaching Tool 2" in the ".modal-body" "css_element"
     And I should not see "Course Tool 2" in the ".modal-body" "css_element"