diff --git a/user/tests/behat/name_fields.feature b/user/tests/behat/name_fields.feature
index ab615123581..0678a643205 100644
--- a/user/tests/behat/name_fields.feature
+++ b/user/tests/behat/name_fields.feature
@@ -10,7 +10,7 @@ Feature: Both first name and surname are always available for every user
       | passwordpolicy  | 0     |
     And I am on site homepage
     And I follow "Log in"
-    And I follow "New Account"
+    And I press "Create new account"
     When I set the following fields to these values:
       | Username      | mrwhitespace        |
       | Password      | Gue$$m3ifY0uC&n     |
@@ -18,7 +18,7 @@ Feature: Both first name and surname are always available for every user
       | Email (again) | mrwhitespace@nas.ty |
     And I set the field "First name" to " "
     And I set the field "Surname" to " "
-    And I click on "Create my new account" "button"
+    And I press "Create my new account"
     Then I should see "Missing given name"
     And I should see "Missing surname"