diff --git a/auth/tests/behat/login.feature b/auth/tests/behat/login.feature
index 087ac3f164e..b8af8a33d1a 100644
--- a/auth/tests/behat/login.feature
+++ b/auth/tests/behat/login.feature
@@ -73,6 +73,6 @@ Feature: Authentication
   Scenario: The login page must have sufficient colour contrast
     Given the following config values are set as admin:
       | custommenuitems | -This is a custom item\|/customurl/ |
-    And I am on site homepage
-    And the page should meet "wcag143" accessibility standards
+    When I am on site homepage
+    Then the page should meet "wcag143" accessibility standards
     And the page should meet accessibility standards with "wcag143" extra tests
diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index 7b7c8acb7f5..9fc33df2c30 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -241,9 +241,9 @@ Feature: Perform basic calendar functionality
 
   @javascript @accessibility
   Scenario: The calendar page must be accessible
-    And I log in as "student1"
+    Given I log in as "student1"
     And I am on "Course 1" course homepage
-    And I follow "This month"
+    When I follow "This month"
     Then the page should meet accessibility standards
     And the page should meet "wcag131, wcag143, wcag412" accessibility standards
     And the page should meet accessibility standards with "wcag131, wcag143, wcag412" extra tests