diff --git a/Rakefile b/Rakefile
index 8d17579cea..9ee1bbfd5a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,5 +11,4 @@ Bundler::GemHelper.install_tasks
 
 load "tasks/blacklight.rake"
 
-task :default => [:ci]
-task :clean => ['blacklight:clean']
+task :default => [:ci]
\ No newline at end of file
diff --git a/blacklight.gemspec b/blacklight.gemspec
index 5e777bb8ca..a5c2bf39b3 100644
--- a/blacklight.gemspec
+++ b/blacklight.gemspec
@@ -31,6 +31,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency "capybara"
   s.add_development_dependency "poltergeist"
-  s.add_development_dependency 'engine_cart', ">= 0.1.0"
+  s.add_development_dependency 'engine_cart', ">= 0.5.0"
   s.add_development_dependency "equivalent-xml"
 end
diff --git a/tasks/blacklight.rake b/tasks/blacklight.rake
index 80ad8c20d5..dc3b83a131 100644
--- a/tasks/blacklight.rake
+++ b/tasks/blacklight.rake
@@ -8,8 +8,13 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern =  'spec/**/*_spec.rb'
 end
 
+EngineCart.fingerprint_proc = lambda do
+  BLACKLIGHT_ROOT = File.expand_path("..", File.dirname(__FILE__))
+  (Dir.glob("#{BLACKLIGHT_ROOT}/*.gemspec") + Dir.glob("#{BLACKLIGHT_ROOT}/Gemfile") + Dir.glob("#{BLACKLIGHT_ROOT}/db/migrate/*") + Dir.glob("#{BLACKLIGHT_ROOT}/lib/generators/**/**") + Dir.glob("#{BLACKLIGHT_ROOT}/spec/test_app_templates/**/**")).map {|f| File.mtime(f) }.max.to_s
+end
+
 desc "Run test suite"
-task :ci => 'blacklight:clean' do
+task :ci => ['blacklight:generate', 'blacklight:clean'] do
   jetty_params = Jettywrapper.load_config('test')
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task["blacklight:fixtures"].invoke
@@ -33,8 +38,8 @@ namespace :blacklight do
     Rake::Task["spec"].invoke
   end
 
-  desc "Clean out the test rails app"
-  task :clean => ['engine_cart:clean', 'jetty:clean'] do
+  desc "Clean out the test jetty"
+  task :clean => ['jetty:clean'] do
   end
 
   desc "Create the test rails app"