diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 24355993..2f6f9df0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -95,10 +95,10 @@ jobs:
       matrix:
         ruby-version: [ 3.4, 3.3, 3.2, jruby-9.4, jruby-10.0 ]
         gemfile:
-          - rails70_gems.rb
           - rails71_gems.rb
           - rails72_gems.rb
           - rails80_gems.rb
+          - rails81_gems.rb
         experimental: [ false ]
         exclude:
           # We already tested last version
@@ -109,7 +109,16 @@ jobs:
           - ruby-version: jruby-9.4
             gemfile: rails80_gems.rb
             experimental: false
+          - ruby-version: jruby-9.4
+            gemfile: rails81_gems.rb
+            experimental: false
         include:
+          - ruby-version: 3.5.0-preview1
+            gemfile: rails81_gems.rb
+            experimental: true
+          - ruby-version: 3.5.0-preview1
+            gemfile: edge_gems.rb
+            experimental: true
           - ruby-version: 3.4
             gemfile: edge_gems.rb
             experimental: true
diff --git a/gemfiles/rails81_gems.rb b/gemfiles/rails81_gems.rb
new file mode 100644
index 00000000..acc0ba85
--- /dev/null
+++ b/gemfiles/rails81_gems.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+gems = "#{File.dirname __dir__}/gems.rb"
+eval File.read(gems), binding, gems
+
+gem "activesupport", "~> 8.1.0.beta1"
+gem "actionpack", "~> 8.1.0.beta1"
diff --git a/lib/capybara/screenshot/diff/area_calculator.rb b/lib/capybara/screenshot/diff/area_calculator.rb
index a9e2d79e..521616f5 100644
--- a/lib/capybara/screenshot/diff/area_calculator.rb
+++ b/lib/capybara/screenshot/diff/area_calculator.rb
@@ -48,7 +48,7 @@ def calculate_skip_area
         def build_regions_for(coordinates)
           coordinates
             .map { |entry| Region.from_edge_coordinates(*entry) }
-            .tap { |it| it.compact! }
+            .tap { |region| region.compact! }
         end
       end
     end
diff --git a/lib/capybara_screenshot_diff/screenshot_assertion.rb b/lib/capybara_screenshot_diff/screenshot_assertion.rb
index ea3380cf..a0e70bc6 100644
--- a/lib/capybara_screenshot_diff/screenshot_assertion.rb
+++ b/lib/capybara_screenshot_diff/screenshot_assertion.rb
@@ -18,9 +18,9 @@ def self.from(screenshot_job)
       return screenshot_job if screenshot_job.is_a?(ScreenshotAssertion)
 
       caller, name, compare = screenshot_job
-      ScreenshotAssertion.new(name).tap do |it|
-        it.caller = caller
-        it.compare = compare
+      ScreenshotAssertion.new(name).tap do |assertion|
+        assertion.caller = caller
+        assertion.compare = compare
       end
     end
 
diff --git a/test/support/test_helpers.rb b/test/support/test_helpers.rb
index 619ade06..030e718d 100644
--- a/test/support/test_helpers.rb
+++ b/test/support/test_helpers.rb
@@ -4,6 +4,7 @@
 
 module TestHelpers
   include Capybara::Screenshot::Diff::TestDoubles
+
   # Common assertions for image comparison tests
   module Assertions
     # Asserts that a dimension check was called a specific number of times