diff --git a/tests/behat/features/adminSettings.feature b/tests/behat/features/adminSettings.feature
index 002bf52831e..16fa4111e57 100644
--- a/tests/behat/features/adminSettings.feature
+++ b/tests/behat/features/adminSettings.feature
@@ -6,23 +6,23 @@ Feature: Settings update
   Scenario: Update 'profile' setting
     Given I am a platform administrator
     Then I am on "/main/admin/settings.php?search_field=profile&category=search_setting"
-    And I check "Name"
-    And I check "e-mail"
-    And I check "Login"
+    And I check the checkbox matching xpath "//input[@name='profile[name]']"
+    And I check "profile[email]"
+    And I check "profile[login]"
     And I check "profile[officialcode]"
-    And I press "Save settings"
+    And I click on the element with css selector "#settings_submit"
     Then I should see "Update successful"
 
   Scenario: Update 'allow_registration' setting
     Given I am a platform administrator
     And I am on "/main/admin/settings.php"
     And I check the "allow_registration" radio button with "true" value
-    And I press "Save settings"
+    And I click on the element with css selector "#settings_submit"
     Then I should see "Update successful"
 
   Scenario: Update 'allow_group_categories' setting
     Given I am a platform administrator
     And I am on "/main/admin/settings.php?search_field=allow_group_categories&category=search_setting"
     And I check the "allow_group_categories" radio button with "true" value
-    And I press "Save settings"
+    And I click on the element with css selector "#settings_submit"
     Then I should see "Update successful"
\ No newline at end of file
diff --git a/tests/behat/features/career.feature b/tests/behat/features/career.feature
index 4efea803801..58282acfee5 100644
--- a/tests/behat/features/career.feature
+++ b/tests/behat/features/career.feature
@@ -6,8 +6,7 @@ Feature: Career
   Scenario: Create a Career
       Given I am a platform administrator
       And I am on "/main/admin/careers.php?action=add"
-      When I fill in the following:
-          | name          | Developer               |
+      When I fill "career_name" with "Developer"
       And I fill in ckeditor field "description" with "Description"
       And I press "submit"
       Then I should see "Item added"