diff --git a/Rakefile b/Rakefile
index 5a30d2082..4e5589e1f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,8 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |test|
   test.warning = true
   test.pattern = 'test/**/test_*.rb'
 end
 
-task :default => :test
+task default: :test
diff --git a/lib/sidekiq/rails.rb b/lib/sidekiq/rails.rb
index f40f77282..773ce99ab 100644
--- a/lib/sidekiq/rails.rb
+++ b/lib/sidekiq/rails.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Sidekiq
   class Rails < ::Rails::Engine
     # We need to setup this up before any application configuration which might
@@ -54,4 +55,4 @@ def inspect
   $stderr.puts("**************************************************")
   $stderr.puts("⛔️ WARNING: Sidekiq server is no longer supported by Rails 3.2 - please ensure your server/workers are updated")
   $stderr.puts("**************************************************")
-end
\ No newline at end of file
+end
diff --git a/test/helper.rb b/test/helper.rb
index e312d606b..c1e94dccd 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -20,36 +20,8 @@
   end
 end
 
-ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
-
-trap 'TSTP' do
-  threads = Thread.list
-
-  puts
-  puts "=" * 80
-  puts "Received TSTP signal; printing all #{threads.count} thread backtraces."
-
-  threads.each do |thr|
-    description = thr == Thread.main ? "Main thread" : thr.inspect
-    puts
-    puts "#{description} backtrace: "
-    puts thr.backtrace.join("\n")
-  end
-
-  puts "=" * 80
-end
-
-require 'minitest/autorun'
-
 Sidekiq.logger.level = Logger::ERROR
 
-REDIS_URL = ENV['REDIS_URL'] || 'redis://localhost/15'
-REDIS = Sidekiq::RedisConnection.create(:url => REDIS_URL)
-
-Sidekiq.configure_client do |config|
-  config.redis = { :url => REDIS_URL }
-end
-
 def capture_logging(lvl=Logger::INFO)
   old = Sidekiq.logger
   begin
diff --git a/test/test_extensions.rb b/test/test_extensions.rb
index 33f67dbc8..183a64250 100644
--- a/test/test_extensions.rb
+++ b/test/test_extensions.rb
@@ -8,7 +8,6 @@
 class TestExtensions < Minitest::Test
   describe 'sidekiq extensions' do
     before do
-      Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }
     end
 
diff --git a/test/test_fetch.rb b/test/test_fetch.rb
index 38da92450..503eabe26 100644
--- a/test/test_fetch.rb
+++ b/test/test_fetch.rb
@@ -6,17 +6,12 @@
 class TestFetcher < Minitest::Test
   describe 'fetcher' do
     before do
-      Sidekiq.redis = { :url => REDIS_URL }
       Sidekiq.redis do |conn|
         conn.flushdb
         conn.rpush('queue:basic', 'msg')
       end
     end
 
-    after do
-      Sidekiq.redis = REDIS
-    end
-
     it 'retrieves' do
       fetch = Sidekiq::BasicFetch.new(:queues => ['basic', 'bar'])
       uow = fetch.retrieve_work
diff --git a/test/test_middleware.rb b/test/test_middleware.rb
index 7c6569362..ff5066fc8 100644
--- a/test/test_middleware.rb
+++ b/test/test_middleware.rb
@@ -7,7 +7,6 @@ class TestMiddleware < Minitest::Test
   describe 'middleware chain' do
     before do
       $errors = []
-      Sidekiq.redis = REDIS
     end
 
     class CustomMiddleware
diff --git a/test/test_redis_connection.rb b/test/test_redis_connection.rb
index ce8016379..6c0879bfe 100644
--- a/test/test_redis_connection.rb
+++ b/test/test_redis_connection.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'helper'
 require 'sidekiq/cli'