diff --git a/blocks/glossary_random/tests/behat/glossary_random_addblock_disabled.feature b/blocks/glossary_random/tests/behat/glossary_random_addblock_disabled.feature
index 0b20b1f3901..641206f5115 100644
--- a/blocks/glossary_random/tests/behat/glossary_random_addblock_disabled.feature
+++ b/blocks/glossary_random/tests/behat/glossary_random_addblock_disabled.feature
@@ -8,29 +8,29 @@ Feature: Add the glossary random block when main feature is disabled
     Given the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1        | topics |
-    And I am on the "C1" "course" page logged in as "admin"
+    And the following "blocks" exist:
+      | blockname       | contextlevel | reference | pagetypepattern | defaultregion |
+      | glossary_random | Course       | C1        | course-view-*   | site-post     |
 
   Scenario: The glossary random block is displayed even when glossary module is disabled
-    Given I turn editing mode on
-    And I add the "Random glossary entry" block
-    When I navigate to "Plugins > Activity modules > Manage activities" in site administration
+    When I log in as "admin"
+    And I navigate to "Plugins > Activity modules > Manage activities" in site administration
     And I click on "Hide" "icon" in the "Glossary" "table_row"
     And I am on "Course 1" course homepage with editing mode on
-    Then I should see "Random glossary entry"
+    Then "Random glossary entry" "block" should exist
 
   Scenario: The glossary random block can be removed even when glossary module is disabled
-    Given I turn editing mode on
-    And I add the "Random glossary entry" block
+    When I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
     And I open the "Random glossary entry" blocks action menu
     And I click on "Delete Random glossary entry block" "link" in the "Random glossary entry" "block"
     And "Delete block?" "dialogue" should exist
     And I click on "Cancel" "button" in the "Delete block?" "dialogue"
-    And I should see "Random glossary entry"
+    And "Random glossary entry" "block" should exist
     When I navigate to "Plugins > Activity modules > Manage activities" in site administration
     And I click on "Hide" "icon" in the "Glossary" "table_row"
     And I am on "Course 1" course homepage with editing mode on
     And I open the "Random glossary entry" blocks action menu
     And I click on "Delete Random glossary entry block" "link" in the "Random glossary entry" "block"
-    And "Delete block?" "dialogue" should exist
     And I click on "Delete" "button" in the "Delete block?" "dialogue"
-    Then I should not see "Random glossary entry"
+    Then "Random glossary entry" "block" should not exist