diff --git a/features/sessions/sign_up.feature b/features/sessions/sign_up.feature
index cb796491f..41d85d71e 100644
--- a/features/sessions/sign_up.feature
+++ b/features/sessions/sign_up.feature
@@ -16,7 +16,7 @@ Feature: Sign up
     Then I fill the sign up form with
     | Full name | Email          | Password | Password confirmation | Team name   |
     | Magnus    | tusk@gmail.com | asdf1234 | asdf1234              | SpliceGirls |
-    And I click "Sign up" button
+    And I click on "Sign up"
     Then I should see "has already been taken"
 
   @javascript
@@ -25,7 +25,7 @@ Feature: Sign up
     Then I fill the sign up form with
     | Full name | Email          | Password | Password confirmation | Team name   |
     | Magnus    | magnus@gmail.com | asdf1234 | asdf1234            | SpliceGirls |
-    And I click "Sign up" button
+    And I click on "Sign up"
     Then I should see "SpliceGirls"
     And I should be on homepage
 
@@ -35,7 +35,7 @@ Feature: Sign up
     Then I fill the sign up form with
     | Full name | Email          | Password | Password confirmation | Team name   |
     | Magnus    | magnus@gmail.com | asdf1234 | asdf1234567         | SpliceGirls |
-    And I click "Sign up" button
+    And I click on "Sign up"
     Then I should see "doesn't match Password"
 
   @javascript
@@ -44,5 +44,5 @@ Feature: Sign up
     Then I fill the sign up form with
     | Full name | Email          | Password | Password confirmation |
     | Magnus    | magnus@gmail.com | asdf1234 | asdf1234            |
-    And I click "Sign up" button
+    And I click on "Sign up"
     Then I should see "is too short (minimum is 2 characters)"
diff --git a/features/settings_page/profile.feature b/features/settings_page/profile.feature
index fa7e07b52..07eda29e9 100644
--- a/features/settings_page/profile.feature
+++ b/features/settings_page/profile.feature
@@ -23,7 +23,7 @@ Scenario: Unsuccessful avatar image upload, file is too big
   Given I'm on the profile page
   Then I click on image within ".avatar-container" element
   And I attach a "Moon.png" file to "user_avatar" field
-  And I click "Upload" button
+  And I click on "Upload"
   And I should see "Your avatar file cannot be larger than 0.2 MB. (Please try again with a smaller file.)" error message
 
 @javascript
@@ -31,7 +31,7 @@ Scenario: Unsuccessful avatar image upload, file is invalid
   Given I'm on the profile page
   Then I click on image within ".avatar-container" element
   And I attach a "File.txt" file to "user_avatar" field
-  And I click "Upload" button
+  And I click on "Upload"
   And I should see "Avatar content type is invalid" error message
 
 @javascript
diff --git a/features/step_definitions/shared_steps.rb b/features/step_definitions/shared_steps.rb
index 743b8d83d..4aa9dced0 100644
--- a/features/step_definitions/shared_steps.rb
+++ b/features/step_definitions/shared_steps.rb
@@ -1,5 +1,5 @@
 When(/^I click "(.+)" button$/) do |button|
-  click_on(button)
+  click_button(button)
 end
 
 Given(/^Show me the page$/) do