diff --git a/features/mentions_from_profile_page.feature b/features/mentions_from_profile_page.feature
index a5b3c3885e861ed1a482b6ca3c2626ecb4a0a0a2..3aebae75ca2f294c1d6eeeff8119bda1be20f410 100644
--- a/features/mentions_from_profile_page.feature
+++ b/features/mentions_from_profile_page.feature
@@ -27,7 +27,6 @@ Feature: mentioning a contact from their profile page
       And I press "Share" in the modal window
       And I wait for the ajax to finish
       When I am on the aspects page
-      And I wait for the ajax to finish
       And I follow "PostingTo" within "#aspect_nav"
       And I wait for the ajax to finish
       Then I should see "I am eating a yogurt"
diff --git a/features/posts_from_main_page.feature b/features/posts_from_main_page.feature
index 020ab169f8c1df7cab2e7dae59f0289e24418521..2c63a0be0c44de302c339581840f38b28e245990 100644
--- a/features/posts_from_main_page.feature
+++ b/features/posts_from_main_page.feature
@@ -26,6 +26,7 @@ Feature: posting from the main page
       When I select only "PostingTo" aspect
       And I expand the publisher
       And I fill in "status_message_fake_text" with "I am eating a yogurt"
+
       And I press "Share"
       And I wait for the ajax to finish
 
diff --git a/features/step_definitions/aspects_steps.rb b/features/step_definitions/aspects_steps.rb
index b5c8ffa16c62fabd98667dcf5421596895f738a0..50cb39429d5fda6439a68ed1592a8edd0c17a874 100644
--- a/features/step_definitions/aspects_steps.rb
+++ b/features/step_definitions/aspects_steps.rb
@@ -13,7 +13,7 @@ When /^I select only "([^"]*)" aspect$/ do |aspect_name|
   And %{I wait for the ajax to finish}
 
   within('#aspect_nav') do
-    click_link 'Select all' if has_link? 'Select all'
+    click_link 'Deselect all' if has_link? 'Deselect all'
   end
 
   And %{I wait for the ajax to finish}
diff --git a/features/step_definitions/session_steps.rb b/features/step_definitions/session_steps.rb
index a58407d3ec73a065e64332d566513179a174ac21..9d0e9dbe8743ee3f242031f93f89afb94e0d9a48 100644
--- a/features/step_definitions/session_steps.rb
+++ b/features/step_definitions/session_steps.rb
@@ -25,7 +25,6 @@ When /^I sign in as "([^"]*)"$/ do |email|
   @me = User.find_by_email(email)
   @me.password ||= 'password'
   Given 'I am signed in'
-  And 'I wait for the ajax to finish'
 end
 
 When /^I sign in with password "([^"]*)"$/ do |password|
diff --git a/features/support/env.rb b/features/support/env.rb
index b03c6cedf2d0321bb21bf77c73eebad039af7418..ce8b4ad84825b39a309c360cd75007eb57b2b580 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -77,6 +77,13 @@ module Resque
   end
 end
 
+# Patch aspect stream to not ajax in itself
+class Stream::Aspect
+  def ajax_stream?
+    false
+  end
+end
+
 Before('@localserver') do
   TestServerFixture.start_if_needed
   CapybaraSettings.instance.save