diff --git a/public/reportbuilder/tests/behat/audience.feature b/public/reportbuilder/tests/behat/audience.feature
index 0a066a27f59..9392c213a24 100644
--- a/public/reportbuilder/tests/behat/audience.feature
+++ b/public/reportbuilder/tests/behat/audience.feature
@@ -1,4 +1,4 @@
-@core_reportbuilder @javascript
+@core @core_reportbuilder @javascript
 Feature: Configure access to reports based on intended audience
   As an admin
   I want to restrict which users have access to a report
@@ -27,12 +27,12 @@ Feature: Configure access to reports based on intended audience
     And I click on the "Audience" dynamic tab
     And I should see "There are no audiences for this report"
     And I click on "Add audience 'Manually added users'" "link"
-    And I should see "Added audience 'Manually added users'"
+    And "Added audience 'Manually added users'" "toast_message" should be visible
     And I should see "Audience not saved" in the "Manually added users" "core_reportbuilder > Audience"
     And I set the following fields in the "Manually added users" "core_reportbuilder > Audience" to these values:
       | Add users manually | User 1,User 3 |
     And I press "Save changes"
-    And I should see "Audience saved"
+    And "Audience saved" "toast_message" should be visible
     And I should not see "Audience not saved" in the "Manually added users" "core_reportbuilder > Audience"
     And I should see "User 1, User 3" in the "Manually added users" "core_reportbuilder > Audience"
     And I should not see "There are no audiences for this report"
@@ -52,7 +52,7 @@ Feature: Configure access to reports based on intended audience
     And I click on the "Audience" dynamic tab
     When I click on "Add audience 'Site administrators'" "link"
     And I press "Save changes"
-    Then I should see "Audience saved"
+    Then "Audience saved" "toast_message" should be visible
     And I click on the "Access" dynamic tab
     And I should see "Admin User" in the "reportbuilder-table" "table"
     And I should not see "User 1" in the "reportbuilder-table" "table"
@@ -66,11 +66,11 @@ Feature: Configure access to reports based on intended audience
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     And I click on the "Audience" dynamic tab
     When I click on "Add audience 'Assigned system role'" "link"
-    And I should see "Added audience 'Assigned system role'"
+    And "Added audience 'Assigned system role'" "toast_message" should be visible
     And I set the following fields in the "Assigned system role" "core_reportbuilder > Audience" to these values:
       | Select a role | Manager |
     And I press "Save changes"
-    Then I should see "Audience saved"
+    Then "Audience saved" "toast_message" should be visible
     And I should see "Manager" in the "Assigned system role" "core_reportbuilder > Audience"
     And I click on the "Access" dynamic tab
     And I should not see "User 1" in the "reportbuilder-table" "table"
@@ -90,11 +90,11 @@ Feature: Configure access to reports based on intended audience
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     And I click on the "Audience" dynamic tab
     When I click on "Add audience 'Member of cohort'" "link"
-    And I should see "Added audience 'Member of cohort'"
+    And "Added audience 'Member of cohort'" "toast_message" should be visible
     And I set the following fields in the "Member of cohort" "core_reportbuilder > Audience" to these values:
       | Select members from cohort | Cohort1 |
     And I press "Save changes"
-    Then I should see "Audience saved"
+    Then "Audience saved" "toast_message" should be visible
     And I should see "Cohort1" in the "Member of cohort" "core_reportbuilder > Audience"
     And I click on the "Access" dynamic tab
     And I should not see "User 1" in the "reportbuilder-table" "table"
@@ -160,9 +160,9 @@ Feature: Configure access to reports based on intended audience
     Then I should see "All users" in the "[data-region=sidebar-menu]" "css_element"
     And I should not see "Member of cohort" in the "[data-region=sidebar-menu]" "css_element"
     And I click on "Add audience 'All users'" "link"
-    And I should see "Added audience 'All users'"
+    And "Added audience 'All users'" "toast_message" should be visible
     And I press "Save changes"
-    And I should see "Audience saved"
+    And "Audience saved" "toast_message" should be visible
 
   Scenario: Rename report audience
     Given I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
@@ -193,7 +193,7 @@ Feature: Configure access to reports based on intended audience
     When I click on "Delete audience 'All users'" "button"
     And I should see "Are you sure you want to delete the audience 'All users'?" in the "Delete audience 'All users'" "dialogue"
     And I click on "Delete" "button" in the "Delete audience 'All users'" "dialogue"
-    Then I should see "Deleted audience 'All users'"
+    Then "Deleted audience 'All users'" "toast_message" should be visible
     And "All users" "core_reportbuilder > Audience" should not exist
     And I should see "There are no audiences for this report"
 
@@ -217,7 +217,7 @@ Feature: Configure access to reports based on intended audience
     And I click on "Delete audience 'All users'" "button"
     And I should see "This audience is used in a schedule for this report" in the "Delete audience 'All users'" "dialogue"
     And I click on "Delete" "button" in the "Delete audience 'All users'" "dialogue"
-    And I should see "Deleted audience 'All users'"
+    And "Deleted audience 'All users'" "toast_message" should be visible
     And "All users" "core_reportbuilder > Audience" should not exist
     And I should see "There are no audiences for this report"
 
@@ -236,7 +236,7 @@ Feature: Configure access to reports based on intended audience
     And I set the following fields in the "Manually added users" "core_reportbuilder > Audience" to these values:
       | Add users manually | User 2 |
     And I press "Save changes"
-    Then I should see "Audience saved"
+    Then "Audience saved" "toast_message" should be visible
     And I should see "User 2" in the "Manually added users" "core_reportbuilder > Audience"
     And I click on the "Access" dynamic tab
     And I should not see "User 1" in the "reportbuilder-table" "table"
diff --git a/public/reportbuilder/tests/behat/cardview.feature b/public/reportbuilder/tests/behat/cardview.feature
index a2ccbe6a2d3..c75e0609698 100644
--- a/public/reportbuilder/tests/behat/cardview.feature
+++ b/public/reportbuilder/tests/behat/cardview.feature
@@ -1,4 +1,4 @@
-@core_reportbuilder @javascript
+@core @core_reportbuilder @javascript
 Feature: Manage card view settings in the report editor
   In order to manage a report card view settings
   As an admin
@@ -29,7 +29,7 @@ Feature: Manage card view settings in the report editor
       | Columns visible       | 3     |
       | First column title    | Yes   |
     And I press "Save changes"
-    And I should see "Card view settings saved"
+    And "Card view settings saved" "toast_message" should be visible
     # Let's check that after switching to preview mode card view form gets rendered again.
     And I click on "Switch to preview mode" "button"
     And I click on "Switch to edit mode" "button"
diff --git a/public/reportbuilder/tests/behat/columnaggregationeditor.feature b/public/reportbuilder/tests/behat/columnaggregationeditor.feature
index b0129d4be6e..cb536f07ceb 100644
--- a/public/reportbuilder/tests/behat/columnaggregationeditor.feature
+++ b/public/reportbuilder/tests/behat/columnaggregationeditor.feature
@@ -1,4 +1,4 @@
-@core_reportbuilder @javascript
+@core @core_reportbuilder @javascript
 Feature: Manage custom report columns aggregation
   In order to manage the aggregation for columns of custom reports
   As an admin
@@ -22,7 +22,7 @@ Feature: Manage custom report columns aggregation
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     And I change window size to "large"
     When I set the "First name" column aggregation to "<aggregation>"
-    Then I should see "Aggregated column 'First name'"
+    Then "Aggregated column 'First name'" "toast_message" should be visible
     And I should see "<output>" in the "Richie" "table_row"
     Examples:
       | aggregation                     | output          |
@@ -42,7 +42,7 @@ Feature: Manage custom report columns aggregation
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     And I change window size to "large"
     When I set the "Full name" column aggregation to "<aggregation>"
-    Then I should see "Aggregated column 'Full name'"
+    Then "Aggregated column 'Full name'" "toast_message" should be visible
     And I should see "<output>" in the "Richie" "table_row"
     Examples:
       | aggregation                     | output                               |
@@ -62,7 +62,7 @@ Feature: Manage custom report columns aggregation
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     And I change window size to "large"
     When I set the "Last access" column aggregation to "<aggregation>"
-    Then I should see "Aggregated column 'Last access'"
+    Then "Aggregated column 'Last access'" "toast_message" should be visible
     And I should see "<output>" in the "Richie" "table_row"
     Examples:
       | aggregation    | output                       |
@@ -82,7 +82,7 @@ Feature: Manage custom report columns aggregation
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     And I change window size to "large"
     When I set the "Confirmed" column aggregation to "<aggregation>"
-    Then I should see "Aggregated column 'Confirmed'"
+    Then "Aggregated column 'Confirmed'" "toast_message" should be visible
     And I should see "<output>" in the "Richie" "table_row"
     Examples:
       | aggregation                     | output       |
@@ -110,7 +110,7 @@ Feature: Manage custom report columns aggregation
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     And I change window size to "large"
     When I set the "Confirmed" column aggregation to "<aggregation>"
-    Then I should see "Aggregated column 'Confirmed'"
+    Then "Aggregated column 'Confirmed'" "toast_message" should be visible
     And I should see "<output>" in the "Richie" "table_row"
     Examples:
       | aggregation | output |
@@ -131,7 +131,7 @@ Feature: Manage custom report columns aggregation
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     And I change window size to "large"
     When I set the "First name" column aggregation to "<aggregation>"
-    Then I should see "Aggregated column 'First name'"
+    Then "Aggregated column 'First name'" "toast_message" should be visible
     And I should see "<output>" in the "Richie" "table_row"
     Examples:
       | aggregation                     | output          |
diff --git a/public/reportbuilder/tests/behat/columneditor.feature b/public/reportbuilder/tests/behat/columneditor.feature
index 82fb7bc31e4..94968508864 100644
--- a/public/reportbuilder/tests/behat/columneditor.feature
+++ b/public/reportbuilder/tests/behat/columneditor.feature
@@ -1,4 +1,4 @@
-@core_reportbuilder @javascript
+@core @core_reportbuilder @javascript
 Feature: Manage custom report columns
   In order to manage the columns of custom reports
   As an admin
@@ -10,7 +10,7 @@ Feature: Manage custom report columns
       | My report | core_user\reportbuilder\datasource\users | 0       |
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     When I click on "Add column 'Full name'" "link"
-    Then I should see "Added column 'Full name'"
+    Then "Added column 'Full name'" "toast_message" should be visible
     And I should see "Full name" in the "reportbuilder-table" "table"
 
   Scenario: Search for and add column to report
@@ -23,7 +23,7 @@ Feature: Manage custom report columns
     Then I should see "Last name" in the "[data-region=sidebar-menu]" "css_element"
     And I should not see "Email address" in the "[data-region=sidebar-menu]" "css_element"
     And I click on "Add column 'Last name'" "link"
-    And I should see "Added column 'Last name'"
+    And "Added column 'Last name'" "toast_message" should be visible
     And I should see "Last name" in the "reportbuilder-table" "table"
 
   Scenario: Rename column in report
@@ -66,7 +66,7 @@ Feature: Manage custom report columns
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     When I click on "Move column 'Last access'" "button"
     And I click on "After \"Full name\"" "link" in the "Move column 'Last access'" "dialogue"
-    Then I should see "Moved column 'Last access'"
+    Then "Moved column 'Last access'" "toast_message" should be visible
     And "Last access" "text" should appear before "Email address" "text"
 
   Scenario: Delete column from report
@@ -79,5 +79,5 @@ Feature: Manage custom report columns
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     When I click on "Delete column 'Full name'" "button"
     And I click on "Delete" "button" in the "Delete column 'Full name'" "dialogue"
-    Then I should see "Deleted column 'Full name'"
+    Then "Deleted column 'Full name'" "toast_message" should be visible
     And I should see "Nothing to display"
diff --git a/public/reportbuilder/tests/behat/columnsortingeditor.feature b/public/reportbuilder/tests/behat/columnsortingeditor.feature
index 87d4be3acf1..3a008a7bf52 100644
--- a/public/reportbuilder/tests/behat/columnsortingeditor.feature
+++ b/public/reportbuilder/tests/behat/columnsortingeditor.feature
@@ -1,4 +1,4 @@
-@core_reportbuilder @javascript
+@core @core_reportbuilder @javascript
 Feature: Manage custom report columns sorting
   In order to manage the sorting for columns of custom reports
   As an admin
@@ -26,10 +26,11 @@ Feature: Manage custom report columns sorting
     # This will be the fallback sort after toggling lastname sorting.
     And I click on "Enable initial sorting for column 'First name'" "checkbox"
     When I click on "Enable initial sorting for column 'Last name'" "checkbox"
-    Then I should see "Updated sorting for column 'Last name'"
+    Then "Updated sorting for column 'Last name'" "toast_message" should be visible
     And "user02" "table_row" should appear before "user01" "table_row"
+    And I wait until "Updated sorting for column 'Last name'" "toast_message" does not exist
     And I click on "Disable initial sorting for column 'Last name'" "checkbox"
-    And I should see "Updated sorting for column 'Last name'"
+    And "Updated sorting for column 'Last name'" "toast_message" should be visible
     And "user01" "table_row" should appear before "user02" "table_row"
 
   Scenario: Change column sort direction in report
@@ -37,10 +38,11 @@ Feature: Manage custom report columns sorting
     And I click on "Show/hide 'Sorting'" "button"
     When I click on "Enable initial sorting for column 'Last name'" "checkbox"
     And I click on "Change initial sorting for column 'Last name' to descending" "button"
-    Then I should see "Updated sorting for column 'Last name'"
+    Then "Updated sorting for column 'Last name'" "toast_message" should be visible
     And "user01" "table_row" should appear before "user02" "table_row"
+    And I wait until "Updated sorting for column 'Last name'" "toast_message" does not exist
     And I click on "Change initial sorting for column 'Last name' to ascending" "button"
-    And I should see "Updated sorting for column 'Last name'"
+    And "Updated sorting for column 'Last name'" "toast_message" should be visible
     And "user02" "table_row" should appear before "user01" "table_row"
 
   Scenario: Change column sort order in report
@@ -50,7 +52,7 @@ Feature: Manage custom report columns sorting
     And I click on "Enable initial sorting for column 'First name'" "checkbox"
     And I click on "Move sorting for column 'First name'" "button"
     And I click on "To the top of the list" "link" in the "Move sorting for column 'First name'" "dialogue"
-    Then I should see "Updated sorting for column 'First name'"
+    Then "Updated sorting for column 'First name'" "toast_message" should be visible
     And "First name" "text" should appear before "Last name" "text" in the "#settingssorting" "css_element"
     And "user01" "table_row" should appear before "user02" "table_row"
 
@@ -59,12 +61,13 @@ Feature: Manage custom report columns sorting
     And I click on "Add column 'Full name'" "link"
     And I click on "Show/hide 'Sorting'" "button"
     When I click on "Enable initial sorting for column 'Full name'" "checkbox"
-    Then I should see "Updated sorting for column 'Full name'"
+    Then "Updated sorting for column 'Full name'" "toast_message" should be visible
     # User1 = Alice Zebra; User2=Zoe Aardvark; User3 = Alice Badger.
     And "user03" "table_row" should appear before "user01" "table_row"
     And "user01" "table_row" should appear before "user02" "table_row"
+    And I wait until "Updated sorting for column 'Full name'" "toast_message" does not exist
     And I click on "Change initial sorting for column 'Full name' to descending" "button"
-    And I should see "Updated sorting for column 'Full name'"
+    And "Updated sorting for column 'Full name'" "toast_message" should be visible
     And "user02" "table_row" should appear before "user01" "table_row"
     And "user01" "table_row" should appear before "user03" "table_row"
 
diff --git a/public/reportbuilder/tests/behat/conditioneditor.feature b/public/reportbuilder/tests/behat/conditioneditor.feature
index 2295ca5daf9..30207aae757 100644
--- a/public/reportbuilder/tests/behat/conditioneditor.feature
+++ b/public/reportbuilder/tests/behat/conditioneditor.feature
@@ -1,4 +1,4 @@
-@core_reportbuilder @javascript
+@core @core_reportbuilder @javascript
 Feature: Manage custom report conditions
   In order to manage the conditions of custom reports
   As an admin
@@ -23,13 +23,13 @@ Feature: Manage custom report conditions
     When I click on "Show/hide 'Conditions'" "button"
     Then I should see "There are no conditions selected" in the "[data-region='settings-conditions']" "css_element"
     And I set the field "Select a condition" to "Email address"
-    And I should see "Added condition 'Email address'"
+    And "Added condition 'Email address'" "toast_message" should be visible
     And I should not see "There are no conditions selected" in the "[data-region='settings-conditions']" "css_element"
     And I set the following fields in the "Email address" "core_reportbuilder > Condition" to these values:
       | Email address operator | Does not contain |
       | Email address value    | user02           |
     And I click on "Apply" "button" in the "[data-region='settings-conditions']" "css_element"
-    And I should see "Conditions applied"
+    And "Conditions applied" "toast_message" should be visible
     And I should see "User One" in the "reportbuilder-table" "table"
     And I should not see "User Two" in the "reportbuilder-table" "table"
 
@@ -43,7 +43,7 @@ Feature: Manage custom report conditions
       | Tag name operator | Is equal to |
       | Tag name value    | dancing     |
     And I click on "Apply" "button" in the "[data-region='settings-conditions']" "css_element"
-    Then I should see "Conditions applied"
+    Then "Conditions applied" "toast_message" should be visible
     And I should see "User One" in the "reportbuilder-table" "table"
     And I should not see "User Two" in the "reportbuilder-table" "table"
 
@@ -57,7 +57,7 @@ Feature: Manage custom report conditions
     When I click on "Show/hide 'Conditions'" "button"
     And I click on "Move condition 'Country'" "button"
     And I click on "After \"Full name\"" "link" in the "Move condition 'Country'" "dialogue"
-    Then I should see "Moved condition 'Country'"
+    Then "Moved condition 'Country'" "toast_message" should be visible
     And "Country" "text" should appear before "Email address" "text"
 
   Scenario: Delete condition from report
@@ -73,7 +73,7 @@ Feature: Manage custom report conditions
     And I click on "Apply" "button" in the "[data-region='settings-conditions']" "css_element"
     And I click on "Delete condition 'Email address'" "button"
     And I click on "Delete" "button" in the "Delete condition 'Email address'" "dialogue"
-    Then I should see "Deleted condition 'Email address'"
+    Then "Deleted condition 'Email address'" "toast_message" should be visible
     And I should see "There are no conditions selected" in the "[data-region='settings-conditions']" "css_element"
     And "[data-region='active-conditions']" "css_element" should not exist
     And I should see "User One" in the "reportbuilder-table" "table"
@@ -93,7 +93,7 @@ Feature: Manage custom report conditions
     And I should see "Nothing to display"
     And I click on "Reset all" "button" in the "[data-region='settings-conditions']" "css_element"
     And I click on "Reset all" "button" in the "Reset conditions" "dialogue"
-    Then I should see "Conditions reset"
+    Then "Conditions reset" "toast_message" should be visible
     And the following fields in the "Email address" "core_reportbuilder > Condition" match these values:
       | Email address operator | Is any value |
     And I should see "User One" in the "reportbuilder-table" "table"
diff --git a/public/reportbuilder/tests/behat/customfields.feature b/public/reportbuilder/tests/behat/customfields.feature
index 2be5a037b04..49f91cbf197 100644
--- a/public/reportbuilder/tests/behat/customfields.feature
+++ b/public/reportbuilder/tests/behat/customfields.feature
@@ -26,7 +26,7 @@ Feature: Manage custom fields for custom reports
     And I set the following fields in the "Edit report details" "dialogue" to these values:
       | Description | My awesome report description |
     And I click on "Save" "button" in the "Edit report details" "dialogue"
-    And I should see "Report updated"
+    And "Report updated" "toast_message" should be visible
     And I click on "Filters" "button"
     And I set the following fields in the "Description" "core_reportbuilder > Filter" to these values:
       | Description operator | Contains |
diff --git a/public/reportbuilder/tests/behat/customreports.feature b/public/reportbuilder/tests/behat/customreports.feature
index 4f5d98fb8d4..f26db777a27 100644
--- a/public/reportbuilder/tests/behat/customreports.feature
+++ b/public/reportbuilder/tests/behat/customreports.feature
@@ -146,7 +146,7 @@ Feature: Manage custom reports
       | Name | My renamed report |
       | Tags | Cat, Dog          |
     And I click on "Save" "button" in the "Edit report details" "dialogue"
-    Then I should see "Report updated"
+    Then "Report updated" "toast_message" should be visible
     And the following should exist in the "Reports list" table:
       | Name              | Tags    | Report source |
       | My renamed report | Cat Dog | Users         |
@@ -167,7 +167,7 @@ Feature: Manage custom reports
       | <filter> operator | Is equal to |
       | <filter> value    | <value>     |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
+    Then "Filters applied" "toast_message" should be visible
     And the following should exist in the "Reports list" table:
       | Name     | Tags    | Report source |
       | My users | Cat Dog | Users         |
@@ -192,8 +192,7 @@ Feature: Manage custom reports
       | Modified by operator | Select     |
       | Modified by value    | Admin User |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
-    And I should see "My report" in the "Reports list" "table"
+    Then I should see "My report" in the "Reports list" "table"
     And I set the field "Modified by value" in the "Modified by" "core_reportbuilder > Filter" to "User 1"
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
     And I should see "Nothing to display"
@@ -211,8 +210,7 @@ Feature: Manage custom reports
       | <filter> from     | ##2 days ago## |
       | <filter> to       | ##tomorrow##   |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
-    And I should see "My report" in the "Reports list" "table"
+    Then I should see "My report" in the "Reports list" "table"
     And I set the field "<filter> to" in the "<filter>" "core_reportbuilder > Filter" to "##yesterday##"
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
     And I should see "Nothing to display"
@@ -235,8 +233,7 @@ Feature: Manage custom reports
     And I click on "Filters" "button"
     And I set the field "Schedules operator" in the "Schedules" "core_reportbuilder > Filter" to "Yes"
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
-    And I should see "My users" in the "Reports list" "table"
+    Then I should see "My users" in the "Reports list" "table"
     And I should not see "My courses" in the "Reports list" "table"
     And I set the field "Schedules operator" in the "Schedules" "core_reportbuilder > Filter" to "No"
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
@@ -254,6 +251,7 @@ Feature: Manage custom reports
       | Name operator | Contains |
       | Name value    | Lionel   |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    Then "Filters applied" "toast_message" should be visible
     And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
     And I should see "Nothing to display"
     And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
@@ -335,7 +333,7 @@ Feature: Manage custom reports
     When I navigate to "Reports > Report builder > Custom reports" in site administration
     And I press "Delete report" action in the "My report" report row
     And I click on "Delete" "button" in the "Delete report" "dialogue"
-    Then I should see "Report deleted"
+    Then "Report deleted" "toast_message" should be visible
     And I should see "Nothing to display"
 
   Scenario: Switch between Preview and Edit mode
diff --git a/public/reportbuilder/tests/behat/filtereditor.feature b/public/reportbuilder/tests/behat/filtereditor.feature
index 0a23e22b37c..e5e48c17b6e 100644
--- a/public/reportbuilder/tests/behat/filtereditor.feature
+++ b/public/reportbuilder/tests/behat/filtereditor.feature
@@ -1,4 +1,4 @@
-@core_reportbuilder @javascript
+@core @core_reportbuilder @javascript
 Feature: Manage custom report filters
   In order to manage the filters of custom reports
   As an admin
@@ -12,7 +12,7 @@ Feature: Manage custom report filters
     When I click on "Show/hide 'Filters'" "button"
     Then I should see "There are no filters selected" in the "[data-region='active-filters']" "css_element"
     And I set the field "Select a filter" to "Email address"
-    And I should see "Added filter 'Email address'"
+    And "Added filter 'Email address'" "toast_message" should be visible
     And I should not see "There are no filters selected" in the "[data-region='active-filters']" "css_element"
     And I should see "Email address" in the "[data-region='active-filters']" "css_element"
 
@@ -74,7 +74,7 @@ Feature: Manage custom report filters
     When I click on "Show/hide 'Filters'" "button"
     And I click on "Move filter 'Country'" "button"
     And I click on "After \"Full name\"" "link" in the "Move filter 'Country'" "dialogue"
-    Then I should see "Moved filter 'Country'"
+    Then "Moved filter 'Country'" "toast_message" should be visible
     And "Country" "text" should appear before "Email address" "text"
 
   Scenario: Delete filter from report
@@ -88,7 +88,7 @@ Feature: Manage custom report filters
     And I click on "Show/hide 'Filters'" "button"
     And I click on "Delete filter 'Email address'" "button"
     And I click on "Delete" "button" in the "Delete filter 'Email address'" "dialogue"
-    Then I should see "Deleted filter 'Email address'"
+    Then "Deleted filter 'Email address'" "toast_message" should be visible
     And I should see "There are no filters selected" in the "[data-region='active-filters']" "css_element"
     And I should not see "Email address" in the "[data-region='active-filters']" "css_element"
 
@@ -102,13 +102,14 @@ Feature: Manage custom report filters
       | Full name operator | Contains |
       | Full name value    | Lionel   |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    And "Filters applied" "toast_message" should be visible
     And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
     And I should see "Nothing to display"
     And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
     And I should not see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
     And I should see "Filters" in the "#dropdownFiltersButton" "css_element"
     And "[data-region='report-filters']" "css_element" should be visible
-    Then I should see "Filters reset"
+    Then "Filters reset" "toast_message" should be visible
     And the following fields in the "Full name" "core_reportbuilder > Filter" match these values:
       | Full name operator | Is any value |
     And I should see "Admin User" in the "Users" "table"
@@ -140,7 +141,7 @@ Feature: Manage custom report filters
       | Full name operator | Does not contain |
       | Full name value    | User 2           |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
+    Then "Filters applied" "toast_message" should be visible
     And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
     And the following should exist in the "reportbuilder-table" table:
       | Full name | Email address     |
@@ -191,7 +192,7 @@ Feature: Manage custom report filters
       | Email address operator | Is not equal to   |
       | Email address value    | user2@example.com |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
+    Then "Filters applied" "toast_message" should be visible
     And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
     # Assert we haven't overridden the condition and user3 is still not showing in the report.
     And the following should exist in the "reportbuilder-table" table:
diff --git a/public/reportbuilder/tests/behat/schedules.feature b/public/reportbuilder/tests/behat/schedules.feature
index 3abf9ed61ba..d8cc0fbd6e7 100644
--- a/public/reportbuilder/tests/behat/schedules.feature
+++ b/public/reportbuilder/tests/behat/schedules.feature
@@ -40,7 +40,7 @@ Feature: Manage custom report schedules
     And I should see "All my lovely users" in the "New schedule" "dialogue"
     And I set the field "Manually added users: User One, User Two" to "1"
     And I click on "Save" "button" in the "New schedule" "dialogue"
-    Then I should see "Schedule created"
+    Then "Schedule created" "toast_message" should be visible
     And the following should exist in the "Report schedules" table:
       | Name        | Time last sent | Time next send                          | Modified by |
       | My schedule | Never          | ##tomorrow 11:00##%A, %d %B %Y, %H:%M## | Admin User  |
@@ -101,8 +101,7 @@ Feature: Manage custom report schedules
       | <filter> from     | ##2 days ago## |
       | <filter> to       | ##today##      |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
-    And I should see "My schedule 1" in the "Report schedules" "table"
+    Then I should see "My schedule 1" in the "Report schedules" "table"
     And I should not see "My schedule 2" in the "Report schedules" "table"
     Examples:
       | filter         |
@@ -119,8 +118,7 @@ Feature: Manage custom report schedules
     When I click on "Filters" "button"
     And I set the field "Enabled operator" in the "Enabled" "core_reportbuilder > Filter" to "Yes"
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
-    And I should see "My schedule 1" in the "Report schedules" "table"
+    Then I should see "My schedule 1" in the "Report schedules" "table"
     And I should not see "My schedule 2" in the "Report schedules" "table"
     And I set the field "Enabled operator" in the "Enabled" "core_reportbuilder > Filter" to "No"
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
@@ -135,10 +133,10 @@ Feature: Manage custom report schedules
     And I click on the "Schedules" dynamic tab
     When I click on "Disable schedule" "field" in the "My schedule" "table_row"
     Then the "class" attribute of "My schedule" "table_row" should contain "text-muted"
-    And I should see "Schedule disabled" in the ".toast-wrapper" "css_element"
+    And "Schedule disabled" "toast_message" should be visible
     And I click on "Enable schedule" "field" in the "My schedule" "table_row"
     And the "class" attribute of "My schedule" "table_row" should be set
-    And I should see "Schedule enabled" in the ".toast-wrapper" "css_element"
+    And "Schedule enabled" "toast_message" should be visible
 
   Scenario: Edit report schedule
     Given the following "core_reportbuilder > Schedules" exist:
@@ -155,7 +153,7 @@ Feature: Manage custom report schedules
       | Body                   | For I haven't got a clue      |
       | If the report is empty | Don't send message            |
     And I click on "Save" "button" in the "Edit schedule details" "dialogue"
-    Then I should see "Schedule updated"
+    Then "Schedule updated" "toast_message" should be visible
     And the following should exist in the "Report schedules" table:
       | Name                | Time last sent | Time next send                          | Modified by |
       | My updated schedule | Never          | ##tomorrow 11:00##%A, %d %B %Y, %H:%M## | Admin User  |
@@ -176,7 +174,7 @@ Feature: Manage custom report schedules
     And I click on the "Schedules" dynamic tab
     When I press "Send schedule" action in the "My schedule" report row
     And I click on "Confirm" "button" in the "Send schedule" "dialogue"
-    Then I should see "Schedule sent"
+    Then "Schedule sent" "toast_message" should be visible
     And I run all adhoc tasks
     And I reload the page
     And the following should exist in the "Report schedules" table:
@@ -191,5 +189,5 @@ Feature: Manage custom report schedules
     And I click on the "Schedules" dynamic tab
     When I press "Delete schedule" action in the "My schedule" report row
     And I click on "Delete" "button" in the "Delete schedule" "dialogue"
-    Then I should see "Schedule deleted"
+    Then "Schedule deleted" "toast_message" should be visible
     And I should see "Nothing to display"