diff --git a/features/desktop/activity_stream.feature b/features/desktop/activity_stream.feature
index 13dd28f27..d7ba1a2ae 100644
--- a/features/desktop/activity_stream.feature
+++ b/features/desktop/activity_stream.feature
@@ -4,9 +4,9 @@ Feature: The activity stream
     Given a user with username "bob"
     When I sign in as "bob@bob.bob"
 
-    And I post "A- I like turtles"
-    And I post "B- barack obama is your new bicycle"
-    And I post "C- barack obama is a square"
+    And I click the publisher and post "A- I like turtles"
+    And I click the publisher and post "B- barack obama is your new bicycle"
+    And I click the publisher and post "C- barack obama is a square"
 
     When I go to the activity stream page
     Then "C- barack obama is a square" should be post 1
diff --git a/features/desktop/connects_users.feature b/features/desktop/connects_users.feature
index 7756ee74d..62c860e42 100644
--- a/features/desktop/connects_users.feature
+++ b/features/desktop/connects_users.feature
@@ -57,7 +57,7 @@ Feature: following and being followed
     Then I should have 1 contact in "Besties"
 
     When I am on the home page
-    And I post "I am following you back"
+    And I click the publisher and post "I am following you back"
     Then I sign out
 
     When I sign in as "bob@bob.bob"
@@ -88,7 +88,7 @@ Feature: following and being followed
     And I am on "alice@alice.alice"'s page
 
     Then I should see "Besties" 
-    Then  I should see a "#mention_button" within "#profile"
+    Then I should see a "#mention_button" within "#profile"
     Then I should not see a "#message_button" within "#profile"
 
   Scenario: interacting with the profile page of someone who follows you but who you do not follow
diff --git a/features/desktop/follows_tags.feature b/features/desktop/follows_tags.feature
index f648f2834..f8cbb228d 100644
--- a/features/desktop/follows_tags.feature
+++ b/features/desktop/follows_tags.feature
@@ -19,7 +19,7 @@ Feature: posting
 
   Scenario: can post a message from the tag page
     Then I should see "#boss" within "#publisher"
-    And I post "#boss from the tag page"
+    And I click the publisher and post "#boss from the tag page"
     And I search for "#boss"
     Then I should see "#boss from the tag page"
 
@@ -31,7 +31,7 @@ Feature: posting
   Scenario: see a tag that I am following and I post over there
     When I go to the home page
     And I follow "#boss"
-    And I post "#boss from the #boss tag page"
+    And I click the publisher and post "#boss from the #boss tag page"
     Then I should see "#boss from the #boss tag page" within "body"
 
   Scenario: can stop following a tag from the tag page
diff --git a/features/desktop/not_safe_for_work.feature b/features/desktop/not_safe_for_work.feature
index 99daba876..72bdbd1e4 100644
--- a/features/desktop/not_safe_for_work.feature
+++ b/features/desktop/not_safe_for_work.feature
@@ -22,8 +22,8 @@ Scenario: Toggling nsfw state
   And a user with email "laura@officeworkers.com"
   And a user with email "laura@officeworkers.com" is connected with "tommy@pr0nking.com"
   When I sign in as "tommy@pr0nking.com"
-  And I post "I love 0bj3ction4bl3 c0nt3nt!"
-  And I post "Sexy Senators Gone Wild!"
+  And I click the publisher and post "I love 0bj3ction4bl3 c0nt3nt!"
+  And I click the publisher and post "Sexy Senators Gone Wild!"
   Then I should have 2 nsfw posts
 
   #toggling global nsfw state
diff --git a/features/desktop/tags_and_comments.feature b/features/desktop/tags_and_comments.feature
index ea9f4f103..35111cc22 100644
--- a/features/desktop/tags_and_comments.feature
+++ b/features/desktop/tags_and_comments.feature
@@ -4,7 +4,7 @@ Feature: Issue #3382 The comments under postings are missing when using the #tag
   Background:
     Given a user named "Bob Jones" with email "bob@bob.bob"
     And I sign in as "bob@bob.bob"
-    When I post "This is a post with a #tag"
+    When I post a status with the text "This is a post with a #tag"
     And I am on the homepage
 
   Scenario:
diff --git a/features/step_definitions/posts_steps.rb b/features/step_definitions/posts_steps.rb
index 672b2eb8f..3b7a8e027 100644
--- a/features/step_definitions/posts_steps.rb
+++ b/features/step_definitions/posts_steps.rb
@@ -51,10 +51,6 @@ Then /^I should see "([^"]*)" as the first post in my stream$/ do |text|
   first_post_text.should include(text)
 end
 
-When /^I post "([^"]*)"$/ do |text|
-  click_and_post(text)
-end
-
 When /^I click the publisher and post "([^"]*)"$/ do |text|
   click_and_post(text)
 end