diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
index b0f939548..a8f5f8506 100644
--- a/spec/controllers/albums_controller_spec.rb
+++ b/spec/controllers/albums_controller_spec.rb
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 require 'spec_helper'
-include ApplicationHelper
+
 describe AlbumsController do
  render_views
   before do
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index fdfaa7e45..2e05b850c 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 require 'spec_helper'
-include ApplicationHelper
+
 describe AspectsController do
  render_views
   before do
diff --git a/spec/controllers/requests_controller_spec.rb b/spec/controllers/requests_controller_spec.rb
index 23e0fdea9..0556ffe5c 100644
--- a/spec/controllers/requests_controller_spec.rb
+++ b/spec/controllers/requests_controller_spec.rb
@@ -3,10 +3,10 @@
 #   the COPYRIGHT file.
 
 require 'spec_helper'
-include ApplicationHelper
-include RequestsHelper
+
 describe RequestsController do
- render_views
+  include RequestsHelper
+  render_views
   before do
     @user = Factory.create :user
     stub_success("tom@tom.joindiaspora.com")
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index d894d147e..459563cff 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -4,7 +4,6 @@
 
 require 'spec_helper'
 
-include ApplicationHelper
 describe ApplicationHelper do
   before do
     @user = Factory.create(:user)
diff --git a/spec/helpers/publics_helper_spec.rb b/spec/helpers/publics_helper_spec.rb
index c58247321..bc6a5021b 100644
--- a/spec/helpers/publics_helper_spec.rb
+++ b/spec/helpers/publics_helper_spec.rb
@@ -4,7 +4,6 @@
 
 require 'spec_helper'
 
-include PublicsHelper
 describe PublicsHelper do
   before do
     @user = Factory.create(:user)
diff --git a/spec/helpers/requests_helper_spec.rb b/spec/helpers/requests_helper_spec.rb
index 984a56ea4..0cd1dbf88 100644
--- a/spec/helpers/requests_helper_spec.rb
+++ b/spec/helpers/requests_helper_spec.rb
@@ -4,8 +4,6 @@
 
 require 'spec_helper'
 
-include RequestsHelper
-
 describe RequestsHelper do
 
   before do
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index 2fbd3e2d6..e37cf0116 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -4,9 +4,6 @@
 
 require 'spec_helper'
 
-include ApplicationHelper
-include Diaspora::Parser
-
 describe Diaspora::Parser do
   before do
     @user = Factory.create(:user, :email => "bob@aol.com")
diff --git a/spec/lib/web_hooks_spec.rb b/spec/lib/web_hooks_spec.rb
index cb81f4ce7..e316817d4 100644
--- a/spec/lib/web_hooks_spec.rb
+++ b/spec/lib/web_hooks_spec.rb
@@ -4,28 +4,23 @@
 
 require 'spec_helper'
 
-include Diaspora
+describe Diaspora::Webhooks do
+  before do
+    @user   = Factory.create(:user)
+    @aspect  = @user.aspect(:name => "losers")
+    @user2   = Factory.create(:user)
+    @aspect2  = @user2.aspect(:name => "losers")
+    friend_users(@user, @aspect, @user2, @aspect2)
+  end
 
-describe Diaspora do
-
-  describe Webhooks do
+  describe "body" do
     before do
-      @user   = Factory.create(:user)
-      @aspect  = @user.aspect(:name => "losers")
-      @user2   = Factory.create(:user)
-      @aspect2  = @user2.aspect(:name => "losers")
-      friend_users(@user, @aspect, @user2, @aspect2)
+      @post = Factory.build(:status_message, :person => @user.person)
     end
 
-    describe "body" do
-      before do
-        @post = Factory.build(:status_message, :person => @user.person)
-      end
-
-      it "should add the following methods to Post on inclusion" do
-        @post.respond_to?(:to_diaspora_xml).should be true
-      end
-
+    it "should add the following methods to Post on inclusion" do
+      @post.respond_to?(:to_diaspora_xml).should be true
     end
+
   end
 end
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index 788d99419..b74006e3d 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -3,8 +3,6 @@
 #   the COPYRIGHT file.
 
 require 'spec_helper'
-include ApplicationHelper
-include Diaspora::Parser
 
 describe 'user encryption' do
   before do