diff --git a/mod/subsection/tests/behat/subsection_actionmenu.feature b/mod/subsection/tests/behat/subsection_actionmenu.feature
index 4530de1ccea..867301e77ae 100644
--- a/mod/subsection/tests/behat/subsection_actionmenu.feature
+++ b/mod/subsection/tests/behat/subsection_actionmenu.feature
@@ -27,7 +27,7 @@ Feature: The module menu replaces the delegated section menu
     Given I click on "Subsection1" "link" in the "region-main" "region"
     And I turn editing mode on
     # Open the action menu.
-    When I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    When I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     Then I should not see "Move right"
     And I should not see "Assign roles"
     And I should not see "Highlight"
@@ -80,7 +80,7 @@ Feature: The module menu replaces the delegated section menu
     Then I should see "Subsection1" in the "h1" "css_element"
     And "Section 1" "text" should exist in the ".breadcrumb" "css_element"
     # Open the section header action menu.
-    And I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    And I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     And "View" "link" should not exist in the "[data-region='header-actions-container']" "css_element"
     And I click on "Section 1" "link" in the ".breadcrumb" "css_element"
     # Section page. Section name should be the title.
@@ -100,7 +100,7 @@ Feature: The module menu replaces the delegated section menu
     And I click on "Cancel" "button"
     And I am on the "C1 > Subsection1" "course > section" page
     # Subsection page. Open the section header action menu.
-    And I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    And I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     And I choose "Edit settings" in the open action menu
     And the field "Section name" matches value "Subsection1"
     And I click on "Cancel" "button"
@@ -119,7 +119,7 @@ Feature: The module menu replaces the delegated section menu
     And I should see "Text copied to clipboard"
     And I am on the "C1 > Subsection1" "course > section" page
     # Subsection page. Open the section header action menu.
-    And I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    And I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     And I choose "Permalink" in the open action menu
     And I click on "Copy to clipboard" "link"
     And I should see "Text copied to clipboard"
@@ -152,7 +152,7 @@ Feature: The module menu replaces the delegated section menu
     And "Subsection2" "link" should not exist in the "#region-main-box" "css_element"
     And I am on the "C1 > Subsection3" "course > section" page
     # Subsection page. Open the section header action menu.
-    And I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    And I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     And I choose "Delete" in the open action menu
     And I click on "Delete" "button" in the "Delete subsection?" "dialogue"
     And I should not see "Subsection3"
@@ -168,7 +168,7 @@ Feature: The module menu replaces the delegated section menu
     Given I am on the "C1 > Subsection1" "course > section" page
     And I should see "Hidden from students"
     # Subsection page. Open the section header action menu.
-    And I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    And I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     And I choose "Show" in the open action menu
     And I should not see "Hidden from students"
     And I click on "Section 1" "link" in the ".breadcrumb" "css_element"
@@ -235,5 +235,5 @@ Feature: The module menu replaces the delegated section menu
     And I should see "Move"
     # Subsection page. Move option should not exist.
     And I am on the "C1 > Subsection1" "course > section" page
-    And I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    And I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     And "Move" "link" should not exist in the "[data-region='header-actions-container']" "css_element"
diff --git a/mod/subsection/tests/behat/subsection_disabled_plugin.feature b/mod/subsection/tests/behat/subsection_disabled_plugin.feature
index 7feff0d78d4..a533e624434 100644
--- a/mod/subsection/tests/behat/subsection_disabled_plugin.feature
+++ b/mod/subsection/tests/behat/subsection_disabled_plugin.feature
@@ -76,7 +76,7 @@ Feature: Courses should not lose subsection contents when mod_subsection is disa
     And I am on "Course 1" course homepage with editing mode on
     # Perform teacher actions instead of fast steps to validate delete
     # an orphaned subsection does not break the course.
-    And I click on "Edit" "icon" in the "Subsection1" "core_courseformat > Section actions menu"
+    And I click on "Edit" "button" in the "Subsection1" "core_courseformat > Section actions menu"
     When I choose "Delete" in the open action menu
     And I click on "Delete" "button" in the "Delete section?" "dialogue"
     Then I enable "subsection" "mod" plugin
@@ -112,7 +112,7 @@ Feature: Courses should not lose subsection contents when mod_subsection is disa
     And I should see "Not available unless: You belong to a group in GX1"
     And I should not see "Edit restrictions"
     And I am on the "C1 > Subsection1" "course > section" page
-    And I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    And I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     And I choose "Delete" in the open action menu
     And I click on "Delete" "button" in the "Delete section?" "dialogue"
     And I enable "subsection" "mod" plugin
@@ -130,7 +130,7 @@ Feature: Courses should not lose subsection contents when mod_subsection is disa
     And I disable "subsection" "mod" plugin
     When I am on the "C1 > Subsection2" "course > section" page
     And I turn editing mode on
-    And I click on "Edit" "icon" in the "[data-region='header-actions-container']" "css_element"
+    And I click on "Edit" "button" in the "[data-region='header-actions-container']" "css_element"
     And I choose "Delete" in the open action menu
     And I click on "Delete" "button" in the "Delete section?" "dialogue"
     And I enable "subsection" "mod" plugin
diff --git a/mod/subsection/tests/behat/subsection_navigation.feature b/mod/subsection/tests/behat/subsection_navigation.feature
index 277589ef2bb..d53e9418fa0 100644
--- a/mod/subsection/tests/behat/subsection_navigation.feature
+++ b/mod/subsection/tests/behat/subsection_navigation.feature
@@ -65,7 +65,7 @@ Feature: Teachers navigate to subsections
     And I am on "Course 1" course homepage with editing mode on
     And I add the "Navigation" block if not present
     # Open all navigation nodes via keyboard because it does not use buttons/links chevrons.
-    And I click on "Actions menu" "link" in the "Navigation" "block"
+    And I click on "Actions menu" "menuitem" in the "Navigation" "block"
     And I press the escape key
     And I press the tab key
     And I press the multiply key