diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1f737037..c7293c02 100755
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -52,7 +52,8 @@ Commitchange::Application.configure do
 
 	config.log_level = :debug
 
-  config.threadsafe!
+	config.threadsafe!
+	config.dependency_loading = true if $rails_rake_task
 	# Turn this on if you want to mess with code inside /node_modules
 	# config.browserify_rails.evaluate_node_modules = true
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 77cc8094..f5bba9c2 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -83,6 +83,8 @@ Commitchange::Application.configure do
 
   config.assets.compile = false
 
+	config.threadsafe!
+	config.dependency_loading = true if $rails_rake_task
 	# Compress json
 	# config.middleware.use Rack::Deflater
 end
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 97c355ae..19c31c8d 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -68,4 +68,11 @@ Commitchange::Application.configure do
 	# with SQLite, MySQL, and PostgreSQL)
 	# config.active_record.auto_explain_threshold_in_seconds = 0.5
 
+	config.assets.compile = false
+
+	config.threadsafe!
+	config.dependency_loading = true if $rails_rake_task
+	# Compress json
+	# config.middleware.use Rack::Deflater
+
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 78284d32..da39a8c5 100755
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -41,5 +41,8 @@ Commitchange::Application.configure do
   config.log_level = :debug
 
   config.action_controller.allow_forgery_protection = false
+
+  config.cache_store = :memory_store
   config.threadsafe!
+
 end
diff --git a/lib/insert/insert_billing_subscriptions.rb b/lib/insert/insert_billing_subscriptions.rb
index bcb37507..48bfecc0 100644
--- a/lib/insert/insert_billing_subscriptions.rb
+++ b/lib/insert/insert_billing_subscriptions.rb
@@ -3,7 +3,6 @@ require 'qx'
 require 'delayed_job_helper'
 require 'active_support/core_ext'
 
-Delayed::Worker.delay_jobs = false
 
 module InsertBillingSubscriptions