diff --git a/gems.rb b/gems.rb
index 41af10fa..9913f508 100644
--- a/gems.rb
+++ b/gems.rb
@@ -15,7 +15,7 @@
 group :test do
   gem "capybara", ">= 3.26"
   gem "mutex_m" # Needed for RubyMine debugging.  Try removing it.
-  gem "minitest", require: false
+  gem "minitest", "< 6", require: false
   gem "minitest-stub-const", require: false
   gem "simplecov", require: false
   gem "rspec", require: false
diff --git a/lib/capybara/screenshot/diff/drivers/chunky_png_driver.rb b/lib/capybara/screenshot/diff/drivers/chunky_png_driver.rb
index 835b311d..88194074 100644
--- a/lib/capybara/screenshot/diff/drivers/chunky_png_driver.rb
+++ b/lib/capybara/screenshot/diff/drivers/chunky_png_driver.rb
@@ -254,10 +254,10 @@ def shift_distance_at(new_img, old_img, x, y, color_distance_limit:)
                   if (x - shift_distance) >= 0 # left
                     ([0, top_row + 1].max..[y + shift_distance, new_img.height - 2].min)
                       .each do |dy|
-                      if color_matches(new_img, org_color, x - shift_distance, dy, color_distance_limit)
-                        return shift_distance
+                        if color_matches(new_img, org_color, x - shift_distance, dy, color_distance_limit)
+                          return shift_distance
+                        end
                       end
-                    end
                   else
                     bounds_breached += 1
                   end
@@ -273,10 +273,10 @@ def shift_distance_at(new_img, old_img, x, y, color_distance_limit:)
                   if (x + shift_distance) < new_img.width # right
                     ([0, top_row + 1].max..[y + shift_distance, new_img.height - 2].min)
                       .each do |dy|
-                      if color_matches(new_img, org_color, x + shift_distance, dy, color_distance_limit)
-                        return shift_distance
+                        if color_matches(new_img, org_color, x + shift_distance, dy, color_distance_limit)
+                          return shift_distance
+                        end
                       end
-                    end
                   else
                     bounds_breached += 1
                   end