diff --git a/.rspec b/.rspec
index d22a635..5f16476 100644
--- a/.rspec
+++ b/.rspec
@@ -1,4 +1,2 @@
 --color
 --format progress
---require ./spec/spec_helper.rb
---tag ~wip
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 283b2b4..aef154b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,21 +1,16 @@
-#require 'rubygems'
-#require 'bundler/setup'
-
 ENV["RAILS_ENV"] ||= "test"
 
+require 'rsolr'
+
 require 'engine_cart'
 EngineCart.load_application!
 
 require 'coveralls'
 Coveralls.wear!
 
-require 'blacklight-hierarchy'
-require 'rsolr'
-
+require 'capybara/rspec'
 require 'rspec/rails'
-
-# Setup blacklight environment
-Blacklight.solr_config = { :url => 'http://127.0.0.1:8983/solr' }
+require 'capybara/rails'
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb
index b707a6b..7c976dc 100644
--- a/spec/test_app_templates/lib/generators/test_app_generator.rb
+++ b/spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -1,8 +1,6 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
-
   def add_gems
     gem 'blacklight'
     Bundler.with_clean_env do