diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
index e8ea44479..815a0663f 100644
--- a/spec/controllers/albums_controller_spec.rb
+++ b/spec/controllers/albums_controller_spec.rb
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 include ApplicationHelper
 describe AlbumsController do
  render_views
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index a186e8b7c..5ce04c56c 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 include ApplicationHelper
 describe AspectsController do
  render_views
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index badfdf496..50ee13bb4 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe PeopleController do
   render_views
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index bea772e20..3e1071f16 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe PublicsController do
  render_views
diff --git a/spec/controllers/requests_controller_spec.rb b/spec/controllers/requests_controller_spec.rb
index f0864abe1..ebde75a97 100644
--- a/spec/controllers/requests_controller_spec.rb
+++ b/spec/controllers/requests_controller_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 include ApplicationHelper
 include RequestsHelper
 describe RequestsController do
diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb
index 799d37500..d83547e98 100644
--- a/spec/controllers/sockets_controller_spec.rb
+++ b/spec/controllers/sockets_controller_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 SocketsController.class_eval <<-EOT
   def url_options
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 4b89c7b31..4be43a0cb 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 include ApplicationHelper
 describe ApplicationHelper do
diff --git a/spec/helpers/publics_helper_spec.rb b/spec/helpers/publics_helper_spec.rb
index 70e9d4606..ec00f671a 100644
--- a/spec/helpers/publics_helper_spec.rb
+++ b/spec/helpers/publics_helper_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 include PublicsHelper
 describe PublicsHelper do
diff --git a/spec/helpers/requests_helper_spec.rb b/spec/helpers/requests_helper_spec.rb
index 2d2be1acb..50cf148cb 100644
--- a/spec/helpers/requests_helper_spec.rb
+++ b/spec/helpers/requests_helper_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 include RequestsHelper
 
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index 3f4e20b1e..5c9a17fd5 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 include ApplicationHelper
 include Diaspora::Parser
diff --git a/spec/lib/hcard_spec.rb b/spec/lib/hcard_spec.rb
index 89ad49924..4836c5468 100644
--- a/spec/lib/hcard_spec.rb
+++ b/spec/lib/hcard_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require File.dirname(__FILE__) + '/../../lib/hcard'
 
 describe HCard do
diff --git a/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb
index e6cd668e2..d60009fd9 100644
--- a/spec/lib/message_handler_spec.rb
+++ b/spec/lib/message_handler_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe MessageHandler do
   before do
diff --git a/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb
index a14ef8f77..eb7a55027 100644
--- a/spec/lib/salmon_salmon_spec.rb
+++ b/spec/lib/salmon_salmon_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Salmon do
   before do
diff --git a/spec/lib/web_hooks_spec.rb b/spec/lib/web_hooks_spec.rb
index d3486f1b5..3b0eb26df 100644
--- a/spec/lib/web_hooks_spec.rb
+++ b/spec/lib/web_hooks_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 include Diaspora
 
diff --git a/spec/lib/websocket_spec.rb b/spec/lib/websocket_spec.rb
index edac7051a..0b76e0f52 100644
--- a/spec/lib/websocket_spec.rb
+++ b/spec/lib/websocket_spec.rb
@@ -2,7 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Diaspora::WebSocket do
   before do
diff --git a/spec/misc_spec.rb b/spec/misc_spec.rb
index d03300211..528782f07 100644
--- a/spec/misc_spec.rb
+++ b/spec/misc_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'making sure the spec runner works' do
 
diff --git a/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb
index ea5afc7cf..356e8b26c 100644
--- a/spec/models/aspect_spec.rb
+++ b/spec/models/aspect_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Aspect do
   before do
diff --git a/spec/models/comments_spec.rb b/spec/models/comments_spec.rb
index 1c20354cf..9d8c7314d 100644
--- a/spec/models/comments_spec.rb
+++ b/spec/models/comments_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Comment do
   describe "user" do
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index 721310409..f1654b25c 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Person do
   before do
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index 3e0b68520..179ed1ccd 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Photo do
   before do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index dc9d4a9b8..c9a114b32 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Post do
   before do
diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb
index b5bd8f9a5..0681e1e22 100644
--- a/spec/models/profile_spec.rb
+++ b/spec/models/profile_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Profile do
   before do
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index 5899cb7fb..e71dc1175 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Request do
   before do
diff --git a/spec/models/retraction_spec.rb b/spec/models/retraction_spec.rb
index 9aa2b8a76..ca93c7c0e 100644
--- a/spec/models/retraction_spec.rb
+++ b/spec/models/retraction_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Retraction do
     before do
diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb
index 005038bf1..59cb70ec6 100644
--- a/spec/models/status_message_spec.rb
+++ b/spec/models/status_message_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe StatusMessage do
   before do
diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb
index d307e7a43..73672e2ec 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe User do
 
diff --git a/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb
index 37648a98c..97bf41197 100644
--- a/spec/models/user/receive_spec.rb
+++ b/spec/models/user/receive_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe User do
 
diff --git a/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb
index 67ed9f799..1c0f59465 100644
--- a/spec/models/user/user_friending_spec.rb
+++ b/spec/models/user/user_friending_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe User do
    before do
diff --git a/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb
index bcab473bc..0a2a53d84 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe User do
   let(:user) { Factory(:user) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 1608bbe58..5478d69fe 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe User do
   let(:user)   { Factory(:user) }
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index 33b86d52c..4c829bcd0 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -4,7 +4,7 @@
 
 
 
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 include ApplicationHelper
 include Diaspora::Parser