diff --git a/Gemfile b/Gemfile
index 9bcfc0302b6473df55d9adfa1378eac8a5a7f8ea..8b44b54e22c0cacaa9d80462026bc194ff64bc06 100644
--- a/Gemfile
+++ b/Gemfile
@@ -296,7 +296,6 @@ group :development, :test do
   gem 'spring-commands-rspec',    '~> 1.0.4'
   gem 'spring-commands-spinach',  '~> 1.1.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
-  gem "spring-commands-sidekiq"
 
   gem 'rubocop', '~> 0.41.2', require: false
   gem 'rubocop-rspec', '~> 1.5.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4bd5b78a0470c7314a30a8450f246fb95b40ca71..3ba6048143cd147fe6cfdefbd99cb559d220054b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -696,8 +696,6 @@ GEM
     spring (1.7.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    spring-commands-sidekiq (1.0.0)
-      spring (>= 0.9.1)
     spring-commands-spinach (1.1.0)
       spring (>= 0.9.1)
     spring-commands-teaspoon (0.0.2)
@@ -957,7 +955,6 @@ DEPENDENCIES
   spinach-rerun-reporter (~> 0.0.2)
   spring (~> 1.7.0)
   spring-commands-rspec (~> 1.0.4)
-  spring-commands-sidekiq
   spring-commands-spinach (~> 1.1.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.6.0)
diff --git a/bin/spring b/bin/spring
index 7fe232c3aae5996a1d6ca1f69d10e636630f5c5c..e0d140fe0c77275134d19722d66f000574bf429d 100755
--- a/bin/spring
+++ b/bin/spring
@@ -3,7 +3,7 @@
 # This file loads spring without using Bundler, in order to be fast.
 # It gets overwritten when you run the `spring binstub` command.
 
-unless defined?(Spring)
+unless (defined?(Spring) || ENV['ENABLE_SPRING'] != '1') && File.basename($0) != 'spring'
   require 'rubygems'
   require 'bundler'