diff --git a/tests/features/varbase/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature b/tests/features/varbase/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature
index fbc7a93bc9996642be7269b526b3eea7ef7bbb2d..16b8ea2fcd2426c7789de62390a8552b6c57485c 100644
--- a/tests/features/varbase/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature
+++ b/tests/features/varbase/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature
@@ -41,7 +41,7 @@ So that they will be able to use the site.
      When I click "Edit" in the "Tester" row
       And I wait
       And I scroll to bottom
-      And I press "Confirm"
+      And I press "Cancel account"
       And I wait
      Then I should see "Are you sure you want to cancel the account Tester?"
      When I select the radio button "Delete the account and its content. This action cannot be undone."
diff --git a/tests/features/varbase/02-user-management/02-03-user-login.feature b/tests/features/varbase/02-user-management/02-03-user-login.feature
index d3181a46e4b2deeaded40ab47a61a40b96e242bc..5ba4fc806df9f9e097b1adf2478e03dc62f4e09b 100644
--- a/tests/features/varbase/02-user-management/02-03-user-login.feature
+++ b/tests/features/varbase/02-user-management/02-03-user-login.feature
@@ -10,6 +10,7 @@ So that I will be able to view/add/edit/ or delete content in the site
      When I fill in "Normal user" for "Username"
       And I fill in "dD.123123ddd" for "Password"
       And I scroll to bottom
+      And I wait 2s
       And I press "Log in"
       And wait
      Then I should see "Normal user"
@@ -21,6 +22,7 @@ So that I will be able to view/add/edit/ or delete content in the site
      When I fill in " " for "Username"
       And I fill in " " for "Password"
       And I scroll to bottom
+      And I wait 2s
      When I press "Log in"
       And wait
      Then I should see "Username field is required"
diff --git a/tests/features/varbase/02-user-management/02-04-persistent-login.feature b/tests/features/varbase/02-user-management/02-04-persistent-login.feature
index d466b8b96e5ae9be0feb2695c02a1258cb6479cc..9626c26774ed47d1452b6116441712c4981beb5e 100644
--- a/tests/features/varbase/02-user-management/02-04-persistent-login.feature
+++ b/tests/features/varbase/02-user-management/02-04-persistent-login.feature
@@ -22,7 +22,8 @@ Feature: User Management - Have persistent login options and configurations
      When I fill in "Normal user" for "Username"
       And I fill in "dD.123123ddd" for "Password"
       And I scroll to bottom
+      And I wait 2s
       And I check the box "Remember me"
-      And I press the "edit-submit" button
+      And I press the "Log in" button
       And I wait
      Then I should see "Normal user"