diff --git a/.circleci/config.yml b/.circleci/config.yml
index acfbf0f8795..db750cff3c8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -277,17 +277,7 @@ jobs:
       BUILDKITE_ANALYTICS_EXECUTION_NAME_PREFIX: "(<< parameters.ruby >>:<< parameters.rails >>:<< parameters.database >>:<< parameters.paperclip >>)"
     steps:
       - setup
-      - when:
-          condition:
-            not:
-              equal: [<<parameters.ruby>>, '2.5']
-          steps:
-            - libvips
-      - when:
-          condition:
-            equal: [<<parameters.ruby>>, '2.5']
-          steps:
-            - imagemagick
+      - libvips
       - test
       - notify
 
@@ -356,6 +346,6 @@ workflows:
       - test_solidus:
           context: slack-secrets
           name: *name
-          matrix: { parameters: { rails: ['5.2'], ruby: ['2.5'], database: ['sqlite'], paperclip: [true] } }
+          matrix: { parameters: { rails: ['5.2'], ruby: ['2.6'], database: ['sqlite'], paperclip: [true] } }
       - dev_tools:
           context: slack-secrets
diff --git a/api/solidus_api.gemspec b/api/solidus_api.gemspec
index 15c2bf32b69..045233db887 100644
--- a/api/solidus_api.gemspec
+++ b/api/solidus_api.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'jbuilder', '~> 2.8'
diff --git a/backend/solidus_backend.gemspec b/backend/solidus_backend.gemspec
index 663e07ee373..f7bff6506ae 100644
--- a/backend/solidus_backend.gemspec
+++ b/backend/solidus_backend.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version
diff --git a/core/app/models/spree/credit_card.rb b/core/app/models/spree/credit_card.rb
index 04d4ec81cdb..5756ed41086 100644
--- a/core/app/models/spree/credit_card.rb
+++ b/core/app/models/spree/credit_card.rb
@@ -97,7 +97,7 @@ def cc_type=(type)
 
     # Sets the last digits field based on the assigned credit card number.
     def set_last_digits
-      self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
+      self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..)
     end
 
     # @return [String] the credit card type if it can be determined from the
diff --git a/core/lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb b/core/lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb
index 374052dadfd..f84817be958 100644
--- a/core/lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb
+++ b/core/lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb
@@ -18,7 +18,7 @@ def build_gem_lines(conservative_versioning)
       requirement = if is_local
                       ", path: \"#{d.source.path}\""
                     elsif is_git
-                      ", git: \"#{d.git}\"".yield_self { |g| d.ref ? g + ", ref: \"#{d.ref}\"" : g }
+                      ", git: \"#{d.git}\"".then { |g| d.ref ? g + ", ref: \"#{d.ref}\"" : g }
                     elsif conservative_versioning
                       ", \"#{conservative_version(@definition.specs[d.name][0])}\""
                     else
diff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rb
index 7b55efae4de..ab2b20df52a 100644
--- a/core/lib/generators/spree/dummy/dummy_generator.rb
+++ b/core/lib/generators/spree/dummy/dummy_generator.rb
@@ -120,7 +120,7 @@ def application_definition
         dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
         unless options[:pretend] || !File.exist?(dummy_application_path)
           contents = File.read(dummy_application_path)
-          contents[(contents.index("module #{module_name}"))..-1]
+          contents[(contents.index("module #{module_name}"))..]
         end
       end
     end
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 61f3cc4e7fe..a07720f5aaf 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -86,7 +86,7 @@ class GatewayError < RuntimeError; end
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7")
   Spree::Deprecation.warn <<~HEREDOC
-    Ruby 2.5 & Ruby 2.6 (both EOL) are deprecated and will not be supported anymore from the next Solidus version.
+    Ruby 2.6, which reached EOL, is deprecated and will not be supported anymore from the next Solidus version.
     Please, upgrade to a more recent Ruby version.
     Read more on the release notes for different Ruby versions here:
     https://www.ruby-lang.org/en/downloads/releases/
diff --git a/core/lib/spree/testing_support/factory_bot.rb b/core/lib/spree/testing_support/factory_bot.rb
index 4c2a1bd96e9..0d8eab0edf1 100644
--- a/core/lib/spree/testing_support/factory_bot.rb
+++ b/core/lib/spree/testing_support/factory_bot.rb
@@ -37,7 +37,7 @@ def self.deprecate_cherry_picking
         Spree::Deprecation.warn(
           "Please do not cherry-pick factories, this is not well supported by FactoryBot, " \
           'follow the changelog instructions on how to migrate your current setup.',
-          callsites[index..-1]
+          callsites[index..]
         )
       end
 
diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
index 3edc172210f..18446c1d649 100644
--- a/core/solidus_core.gemspec
+++ b/core/solidus_core.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   %w[
diff --git a/sample/solidus_sample.gemspec b/sample/solidus_sample.gemspec
index 8b5feac3683..dc2f3d9f8d3 100644
--- a/sample/solidus_sample.gemspec
+++ b/sample/solidus_sample.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_core', s.version
diff --git a/solidus.gemspec b/solidus.gemspec
index 7da2833ac29..b0a030cb5c3 100644
--- a/solidus.gemspec
+++ b/solidus.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['README.md', 'lib/**/*']
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version