diff --git a/spec/algebra/unit/relations/table_spec.rb b/spec/arel/table_spec.rb
similarity index 100%
rename from spec/algebra/unit/relations/table_spec.rb
rename to spec/arel/table_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e92129d723..5d3f5a2950 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'spec'
-require 'pp'
 require 'fileutils'
 require 'arel'
 
@@ -8,15 +7,7 @@ if adapter = ENV['ADAPTER']
   require "support/connections/#{adapter}_connection.rb"
 end
 
-Dir["spec/{support,shared}/*.rb"].each do |file|
-  require file
-end
-
 Spec::Runner.configure do |config|
-  config.include Matchers
-  config.include AdapterGuards
-  config.include Check
-
   if defined?(ActiveRecord::Base)
     tmp = File.expand_path('../../tmp', __FILE__)