diff --git a/.rubocop.yml b/.rubocop.yml
index 1f3245092..82fa43cdd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -30,7 +30,7 @@ Lint/AmbiguousBlockAssociation:
   Exclude:
     - "spec/**/*"
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: true
 
 Lint/UselessAssignment:
@@ -42,7 +42,7 @@ Metrics/AbcSize:
 Metrics/CyclomaticComplexity:
   Max: 7
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 Metrics/MethodLength:
@@ -54,6 +54,7 @@ Metrics/BlockLength:
     - "**/spec/**/*.rb"
     - "**/*.rake"
     - "Rakefile"
+    - "Gemfile"
     - "*.gemspec"
 
 Metrics/PerceivedComplexity:
@@ -73,7 +74,7 @@ Naming/FileName:
 Naming/RescuedExceptionsVariableName:
   PreferredName: ex
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   AllowedNames:
     - ex
 
@@ -134,6 +135,15 @@ Style/FrozenStringLiteralComment:
 Style/GlobalVars:
   Enabled: true
 
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
+
 Style/ModuleFunction:
   Enabled: false
 
diff --git a/Gemfile b/Gemfile
index 040ae2017..91a581963 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ platforms :mri do
   gem "rubocop-performance"
   gem "rubocop-rspec"
   gem "ruby-prof"
-  gem "simplecov", '< 0.18'
+  gem "simplecov", "< 0.18"
   gem "simplecov-material"
   gem "simplecov-oj"
   gem "stackprof"
diff --git a/lib/sidekiq_unique_jobs/version_check.rb b/lib/sidekiq_unique_jobs/version_check.rb
index d552a23b5..e3a437c6f 100644
--- a/lib/sidekiq_unique_jobs/version_check.rb
+++ b/lib/sidekiq_unique_jobs/version_check.rb
@@ -7,7 +7,7 @@ module SidekiqUniqueJobs
   # @author Mikael Henriksson <mikael@zoolutions.se>
   #
   class VersionCheck
-    PATTERN = /(?<operator1>[<>=]+)?\s?(?<version1>(\d+.?)+)(\s+&&\s+)?(?<operator2>[<>=]+)?\s?(?<version2>(\d+.?)+)?/m.freeze # rubocop:disable Metrics/LineLength
+    PATTERN = /(?<operator1>[<>=]+)?\s?(?<version1>(\d+.?)+)(\s+&&\s+)?(?<operator2>[<>=]+)?\s?(?<version2>(\d+.?)+)?/m.freeze # rubocop:disable Layout/LineLength
 
     #
     # Checks if a version is consrtaint is satisfied
diff --git a/lib/sidekiq_unique_jobs/web.rb b/lib/sidekiq_unique_jobs/web.rb
index dc74ef07f..63abd8850 100644
--- a/lib/sidekiq_unique_jobs/web.rb
+++ b/lib/sidekiq_unique_jobs/web.rb
@@ -2,7 +2,7 @@
 
 begin
   require "sidekiq/web"
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError # rubocop:disable Lint/SuppressedException
   # client-only usage
 end
 
diff --git a/spec/integration/sidekiq_unique_jobs/lock/while_executing_spec.rb b/spec/integration/sidekiq_unique_jobs/lock/while_executing_spec.rb
index 5876eac5c..cf876786e 100644
--- a/spec/integration/sidekiq_unique_jobs/lock/while_executing_spec.rb
+++ b/spec/integration/sidekiq_unique_jobs/lock/while_executing_spec.rb
@@ -4,8 +4,8 @@
 RSpec.describe SidekiqUniqueJobs::Lock::WhileExecuting, redis: :redis do
   include SidekiqHelpers
 
-  let(:process_one) { described_class.new(item_one, callback_one) }
-  let(:process_two) { described_class.new(item_two, callback_two) }
+  let(:process_one)  { described_class.new(item_one, callback_one) }
+  let(:process_two)  { described_class.new(item_two, callback_two) }
   let(:strategy_one) { nil }
   let(:strategy_two) { nil }
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6a7140bea..be851f512 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,8 +27,8 @@
 
 require "sidekiq/redis_connection"
 
-Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].each { |f| require f }
-Dir[File.join(File.dirname(__FILE__), "..", "examples", "**", "*.rb")].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].sort.each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), "..", "examples", "**", "*.rb")].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.define_derived_metadata do |meta|
diff --git a/spec/unit/sidekiq_unique_jobs/cli_spec.rb b/spec/unit/sidekiq_unique_jobs/cli_spec.rb
index f981ebca9..7301a3072 100644
--- a/spec/unit/sidekiq_unique_jobs/cli_spec.rb
+++ b/spec/unit/sidekiq_unique_jobs/cli_spec.rb
@@ -106,8 +106,10 @@ def exec(*cmds)
       let(:console_class) { defined?(Pry) ? Pry : IRB }
 
       before do
-        require "pry"
-      rescue NameError, LoadError, NoMethodError # rubocop:disable Lint/SuppressedException, Lint/ShadowedException
+        begin
+          require "pry"
+        rescue NameError, LoadError, NoMethodError # rubocop:disable Lint/ShadowedException, Lint/SuppressedException
+        end
       end
 
       it_behaves_like "start console"
diff --git a/spec/unit/sidekiq_unique_jobs/on_conflict/strategy_spec.rb b/spec/unit/sidekiq_unique_jobs/on_conflict/strategy_spec.rb
index 4521d077f..bcf8096f2 100644
--- a/spec/unit/sidekiq_unique_jobs/on_conflict/strategy_spec.rb
+++ b/spec/unit/sidekiq_unique_jobs/on_conflict/strategy_spec.rb
@@ -21,10 +21,4 @@
       expect { call }.to raise_error(NotImplementedError, "needs to be implemented in child class")
     end
   end
-
-  describe "#replace?" do
-    subject { strategy.replace? }
-
-    it { is_expected.to eq(false) }
-  end
 end
diff --git a/spec/unit/sidekiq_unique_jobs/sidekiq_worker_methods_spec.rb b/spec/unit/sidekiq_unique_jobs/sidekiq_worker_methods_spec.rb
index d8a84ff30..aac1cc58d 100644
--- a/spec/unit/sidekiq_unique_jobs/sidekiq_worker_methods_spec.rb
+++ b/spec/unit/sidekiq_unique_jobs/sidekiq_worker_methods_spec.rb
@@ -32,7 +32,7 @@ def initialize(worker_class)
       it { is_expected.to eq(MyUniqueJob) }
     end
 
-    context "when worker_class is MyUniqueJob" do
+    context "when worker_class is UntilExecutedJob" do
       let(:worker_class) { "UntilExecutedJob" }
 
       it { is_expected.to eq(UntilExecutedJob) }