diff --git a/Rakefile b/Rakefile
index 13a99536b..c4d34f626 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,5 +3,5 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-Rails.application.load_tasks
+Rails.application.load_tasks if Rake::Task.tasks.empty?
 KnapsackPro.load_tasks if defined?(KnapsackPro)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c90695dca..c3772d5d8 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -12,7 +12,7 @@ require 'capybara/rails'
 require 'capybara/rspec'
 require 'selenium/webdriver'
 
-Rails.application.load_tasks
+Rails.application.load_tasks if Rake::Task.tasks.empty?
 I18n.default_locale = :en
 
 include Warden::Test::Helpers