diff --git a/admin/tool/behat/tests/behat/tabs.feature b/admin/tool/behat/tests/behat/tabs.feature
index 9ce2fa5e820..b0525066996 100644
--- a/admin/tool/behat/tests/behat/tabs.feature
+++ b/admin/tool/behat/tests/behat/tabs.feature
@@ -27,8 +27,8 @@ Feature: Confirm that we can open multiple browser tabs
     # Switch between all the tabs and confirm their different contents.
     Then I should see "No courses"
     And I switch to "CourseViewer2" tab
-    And I should see "Course 3" in the "h1" "css_element"
+    And "Course 3" "heading" should exist
     And I switch to "CourseViewer1" tab
-    And I should see "Course 2" in the "h1" "css_element"
+    And "Course 2" "heading" should exist
     And I switch to the main tab
-    And I should see "Course 1" in the "h1" "css_element"
+    And "Course 1" "heading" should exist
diff --git a/lib/behat/classes/partial_named_selector.php b/lib/behat/classes/partial_named_selector.php
index bbb098bf6dc..f4874c3eaaa 100644
--- a/lib/behat/classes/partial_named_selector.php
+++ b/lib/behat/classes/partial_named_selector.php
@@ -104,6 +104,7 @@ class behat_partial_named_selector extends \Behat\Mink\Selector\PartialNamedSele
         'group_message_tab' => 'group_message_tab',
         'group_message_list_area' => 'group_message_list_area',
         'group_message_message_content' => 'group_message_message_content',
+        'heading' => 'heading',
         'icon_container' => 'icon_container',
         'icon' => 'icon',
         'link' => 'link',
@@ -205,6 +206,9 @@ XPATH
 XPATH
     , 'group_message_message_content' => <<<XPATH
         .//*[@data-region='message-drawer']//*[@data-region='message' and @data-message-id and contains(., %locator%)]
+XPATH
+    , 'heading' => <<<XPATH
+        .//*[self::h1 or self::h2 or self::h3 or self::h4 or self::h5 or self::h6][contains(normalize-space(.), %locator%)]
 XPATH
     , 'icon_container' => <<<XPATH
         .//span[contains(@data-region, concat(%locator%,'-icon-container'))]
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index de9dcaeef0e..a0126c455fe 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,8 +1,10 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
-=== 4.1.8 ===
+=== 4.1.9
+* New Behat `heading` named selector to more easily assert the presence of H1-H6 elements on the page
 
+=== 4.1.8 ===
 * The current page language is available in new `core/config` language property for Javascript modules
 
 === 4.1.7 ===