diff --git a/lib/capybara/spec/session.rb b/lib/capybara/spec/session.rb
deleted file mode 100644
index b1709a46..00000000
--- a/lib/capybara/spec/session.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'capybara/spec/test_app'
-require 'capybara/spec/spec_helper'
-require 'nokogiri'
-
-Dir[File.dirname(__FILE__)+'/session/*'].each { |group| require group }
diff --git a/lib/capybara/spec/spec_helper.rb b/lib/capybara/spec/spec_helper.rb
index 6f2ca5a8..7a21404f 100644
--- a/lib/capybara/spec/spec_helper.rb
+++ b/lib/capybara/spec/spec_helper.rb
@@ -1,3 +1,8 @@
+require 'capybara/rspec' # Required here instead of in rspec_spec to avoid RSpec deprecation warning
+require 'capybara/spec/test_app'
+require 'capybara/spec/spec_helper'
+require 'nokogiri'
+
 module Capybara
   module SpecHelper
     class << self
@@ -79,3 +84,5 @@ end
 RSpec.configure do |config|
   Capybara::SpecHelper.configure(config)
 end
+
+Dir[File.dirname(__FILE__)+'/session/*'].each { |group| require group }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 47471f3f..41b3dbf6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -24,9 +24,7 @@ RSpec.configure do |config|
   end
 end
 
-# Required here instead of in rspec_spec to avoid RSpec deprecation warning
-require 'capybara/rspec'
-require 'capybara/spec/session'
+require 'capybara/spec/spec_helper'
 
 alias :running :lambda