diff --git a/spec/rubocop/cli/options_spec.rb b/spec/rubocop/cli/options_spec.rb
index 65befad196a..22a4c31dcdf 100644
--- a/spec/rubocop/cli/options_spec.rb
+++ b/spec/rubocop/cli/options_spec.rb
@@ -238,7 +238,7 @@
           module RuboCop
             module Cop
               module Style
-                class SomeCop < Cop
+                class SomeCop < Base
                 end
               end
             end
@@ -330,7 +330,7 @@ class SomeCop < Cop
           module RuboCop
             module Cop
               module Style
-                class SomeCop < Cop
+                class SomeCop < Base
                 end
               end
             end
@@ -378,7 +378,7 @@ class SomeCop < Cop
             module RuboCop
               module Cop
                 module Style
-                  class SomeCop < Cop
+                  class SomeCop < Base
                   end
                 end
               end
diff --git a/spec/rubocop/config_loader_spec.rb b/spec/rubocop/config_loader_spec.rb
index c651a4235a9..4934391097e 100644
--- a/spec/rubocop/config_loader_spec.rb
+++ b/spec/rubocop/config_loader_spec.rb
@@ -736,7 +736,7 @@ def enabled?(cop)
             module RuboCop
               module Cop
                 module Custom
-                  class Loop < Cop
+                  class Loop < Base
                   end
                 end
               end
diff --git a/spec/rubocop/cop/internal_affairs/undefined_config_spec.rb b/spec/rubocop/cop/internal_affairs/undefined_config_spec.rb
index c26eb2fa941..8bd1e85c9f3 100644
--- a/spec/rubocop/cop/internal_affairs/undefined_config_spec.rb
+++ b/spec/rubocop/cop/internal_affairs/undefined_config_spec.rb
@@ -192,6 +192,7 @@ def configured?
     RUBY
   end
 
+  # TODO: Remove this test when the `Cop` base class is removed
   it 'works when the base class is `Cop` instead of `Base`' do
     expect_offense(<<~RUBY)
       module RuboCop
diff --git a/spec/support/cops/class_must_be_a_module_cop.rb b/spec/support/cops/class_must_be_a_module_cop.rb
index fbdb55db39d..dfb3d95a2d4 100644
--- a/spec/support/cops/class_must_be_a_module_cop.rb
+++ b/spec/support/cops/class_must_be_a_module_cop.rb
@@ -3,13 +3,13 @@
 module RuboCop
   module Cop
     module Test
-      class ClassMustBeAModuleCop < RuboCop::Cop::Cop # rubocop:disable InternalAffairs/InheritDeprecatedCopClass
-        def on_class(node)
-          add_offense(node, message: 'Class must be a Module')
-        end
+      class ClassMustBeAModuleCop < RuboCop::Cop::Base
+        extend AutoCorrector
 
-        def autocorrect(node)
-          ->(corrector) { corrector.replace(node.loc.keyword, 'module') }
+        def on_class(node)
+          add_offense(node, message: 'Class must be a Module') do |corrector|
+            corrector.replace(node.loc.keyword, 'module')
+          end
         end
       end
     end
diff --git a/spec/support/cops/module_must_be_a_class_cop.rb b/spec/support/cops/module_must_be_a_class_cop.rb
index 7c1953a6583..4bb23eeb6cc 100644
--- a/spec/support/cops/module_must_be_a_class_cop.rb
+++ b/spec/support/cops/module_must_be_a_class_cop.rb
@@ -3,13 +3,13 @@
 module RuboCop
   module Cop
     module Test
-      class ModuleMustBeAClassCop < RuboCop::Cop::Cop # rubocop:disable InternalAffairs/InheritDeprecatedCopClass
-        def on_module(node)
-          add_offense(node, message: 'Module must be a Class')
-        end
+      class ModuleMustBeAClassCop < RuboCop::Cop::Base
+        extend AutoCorrector
 
-        def autocorrect(node)
-          ->(corrector) { corrector.replace(node.loc.keyword, 'class') }
+        def on_module(node)
+          add_offense(node, message: 'Module must be a Class') do |corrector|
+            corrector.replace(node.loc.keyword, 'class')
+          end
         end
       end
     end