diff --git a/tests/behat/calendar_features.feature b/tests/behat/calendar_features.feature
index 9d777580c8..35bd229830 100644
--- a/tests/behat/calendar_features.feature
+++ b/tests/behat/calendar_features.feature
@@ -18,13 +18,14 @@ Feature: Test the calendar related features in the attendance module
       | course   | C1              |
       | idnumber | 00001           |
       | name     | Test attendance |
+    And the following "blocks" exist:
+      | blockname         | contextlevel | reference | pagetypepattern | defaultregion |
+      | calendar_month    | Course       | C1        | course-view-*   | side-pre      |
     And I log in as "teacher1"
 
   @javascript
   Scenario: Calendar events can be created automatically with sessions creation
-    Given I am on "Course 1" course homepage with editing mode on
-    And I add the "Calendar" block
-    And I am on the "Test attendance" "mod_attendance > View" page
+    Given I am on the "Test attendance" "mod_attendance > View" page
     And I click on "Add session" "button"
     And I set the following fields to these values:
       | id_sestime_starthour   | 23 |
@@ -33,5 +34,5 @@ Feature: Test the calendar related features in the attendance module
       | id_sestime_endminute   | 55 |
     And I click on "id_submitbutton" "button"
     And I am on "Course 1" course homepage
-    And I click on "Full calendar" "link"
+    And I follow "Course calendar"
     Then I should see "Test attendance"
diff --git a/tests/behat/defaultstatus.feature b/tests/behat/defaultstatus.feature
index 38f55c9013..439d246fa6 100644
--- a/tests/behat/defaultstatus.feature
+++ b/tests/behat/defaultstatus.feature
@@ -11,6 +11,11 @@ Feature: Admin can set default status set for use in new attendance
     And the following "course enrolments" exist:
       | course | user     | role           | timestart     |
       | C1     | teacher1 | editingteacher | ##yesterday## |
+    And the following "activity" exists:
+      | activity | attendance      |
+      | course   | C1              |
+      | idnumber | 00001           |
+      | name     | Attendance1     |
     And I log in as "admin"
     And I navigate to "Plugins > Attendance" in site administration
     And I follow "Default status set"
@@ -23,9 +28,6 @@ Feature: Admin can set default status set for use in new attendance
   Scenario: Modified default status set added to new attendance
 
     Given I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Attendance" to section "1" and I fill the form with:
-      | Name        | Attendance1       |
     And I am on the "Attendance1" "mod_attendance > View" page
     And I click on "More" "link" in the ".secondary-navigation" "css_element"
     And I select "Status set" from secondary navigation