diff --git a/blocks/calendar_month/tests/behat/block_calendar_month.feature b/blocks/calendar_month/tests/behat/block_calendar_month.feature
index 5a4dd4d9202..df6ed1cb38b 100644
--- a/blocks/calendar_month/tests/behat/block_calendar_month.feature
+++ b/blocks/calendar_month/tests/behat/block_calendar_month.feature
@@ -82,13 +82,11 @@ Feature: Enable the calendar block in a course and test it's functionality
     And I turn editing mode on
     And I add the "Calendar" block
     And I click on "Full calendar" "link"
-    And I click on "New event" "button"
-    And I set the following fields to these values:
-      | id_eventtype | Group |
-      | id_name | Group Event |
-    And I set the following fields to these values:
-      | Group | Group 1 |
-    And I press "Save"
+    And I set the field "course" to "C1"
+    And I create a calendar event:
+      | Type of event | group       |
+      | Group         | Group 1     |
+      | Event title   | Group Event |
     And I log out
     Then I log in as "student1"
     And I am on "Course 1" course homepage
diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index 11aa0b487c7..557bb7c29c5 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -188,7 +188,7 @@ Feature: Perform basic calendar functionality
     When I am viewing site calendar
     And I click on "New event" "button"
     Then the field "Type of event" matches value "User"
-    And I click on "Close" "button"
+    And I click on "Close" "button" in the "New event" "dialogue"
     And I set the field "course" to "C1"
     When I click on "New event" "button"
     Then the field "Type of event" matches value "Course"