diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5fa514c..998a236 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
@@ -28,9 +28,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - "2.4"
-          - "2.5"
-          - "2.6"
           - "2.7"
           - "3.0"
           - "3.1"
diff --git a/.rubocop.yml b/.rubocop.yml
index 98871a8..2460dbb 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,7 +9,13 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: '2.4'
+  TargetRubyVersion: '2.7'
+
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
+Gemspec/RequireMFA:
+  Enabled: false
 
 Style/TrailingCommaInHashLiteral:
   Enabled: True
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4f1ba51..10eeb41 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-03-17 12:20:43 UTC using RuboCop version 1.12.1.
+# on 2023-03-17 13:00:57 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -17,7 +17,8 @@ Naming/AccessorMethodName:
     - 'lib/beaker-rspec/helpers/serverspec.rb'
 
 # Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
@@ -25,13 +26,21 @@ Naming/FileName:
 
 # Offense count: 1
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
   Exclude:
     - 'lib/beaker-rspec/beaker_shim.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: be_a, be_kind_of
+RSpec/ClassCheck:
+  Exclude:
+    - 'spec/acceptance/example_spec.rb'
+
 # Offense count: 3
-# Configuration parameters: Prefixes.
+# Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
@@ -40,5 +49,17 @@ RSpec/ContextWording:
 # Offense count: 1
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
+  Exclude:
+    - '**/spec/features/**/*'
+    - '**/spec/requests/**/*'
+    - '**/spec/routing/**/*'
+    - '**/spec/system/**/*'
+    - '**/spec/views/**/*'
+    - 'spec/acceptance/example_spec.rb'
+
+# Offense count: 5
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
   Exclude:
     - 'spec/acceptance/example_spec.rb'
diff --git a/beaker-rspec.gemspec b/beaker-rspec.gemspec
index ca2ef05..6a9e435 100644
--- a/beaker-rspec.gemspec
+++ b/beaker-rspec.gemspec
@@ -12,10 +12,9 @@ Gem::Specification.new do |s|
   s.description = %q{RSpec bindings for beaker, see https://github.com/voxpupuli/beaker}
   s.license     = 'Apache-2.0'
 
-  s.required_ruby_version = '>= 2.4.0', '<4.0.0'
+  s.required_ruby_version = '>= 2.7.0', '<4.0.0'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
@@ -25,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 13.0'
 
   # rubocop
-  s.add_development_dependency 'rubocop', '~> 1.12.0'
+  s.add_development_dependency 'rubocop', '~> 1.48.1'
   s.add_development_dependency 'rubocop-minitest'
   s.add_development_dependency 'rubocop-performance'
   s.add_development_dependency 'rubocop-rake'