diff --git a/features/support/env.rb b/features/support/env.rb
index b6838f6..4d22ca6 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -5,6 +5,9 @@
 # files.
 
 ENV["RAILS_ENV"] ||= "cucumber"
+abort unless system 'rake -s solr:start'
+at_exit { system 'rake -s solr:stop' }
+
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
@@ -48,13 +51,6 @@ ActionController::Base.allow_rescue = false
 Cucumber::Rails::World.use_transactional_fixtures = true
 # How to clean your database when transactions are turned off. See
 # http://github.com/bmabey/database_cleaner for more info.
-if defined?(ActiveRecord::Base)
-  begin
-    require 'database_cleaner'
-    DatabaseCleaner.strategy = :truncation
-  rescue LoadError => ignore_if_database_cleaner_not_present
-  end
-end
 
 Before do
   Fixtures.reset_cache
--
libgit2 0.21.2