diff --git a/.rubocop.yml b/.rubocop.yml
index 4cb053cb..18156293 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -42,7 +42,7 @@ Gemspec/DeprecatedAttributeAssignment:
   Enabled: false
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   Exclude:
     - tmp/**/*
     - "vendor/**/*"
@@ -55,4 +55,3 @@ Style/FrozenStringLiteralComment:
     - "**/bin/*"
     - "**/exe/*"
     - "spec/**/*"
-
diff --git a/Gemfile b/Gemfile
index 9151647d..eb0159f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,9 +10,6 @@ gemspec
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-# A workaround for https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
-
 # These gems will be used by the temporary extensions generated by tests
 group :test do
   gem 'mysql2'
diff --git a/README.md b/README.md
index 34f0326b..d2ceecb5 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you have an existing extension and want to update it to use the latest standa
 you can run the following in the extension's directory:
 
 ```console
-$ solidus extension .
+$ bundle exec solidus extension .
 ```
 
 In case of conflicting files, you will be prompted for an action. You can overwrite the files with
diff --git a/lib/solidus_dev_support/rubocop/config.yml b/lib/solidus_dev_support/rubocop/config.yml
index ed66061f..972520c6 100644
--- a/lib/solidus_dev_support/rubocop/config.yml
+++ b/lib/solidus_dev_support/rubocop/config.yml
@@ -1,6 +1,6 @@
 require: ["rubocop-rspec", "rubocop-rails", "rubocop-performance"]
 
-AllCops: {TargetRubyVersion: 2.5, Exclude: ["spec/dummy/**/*", "sandbox/**/*", "vendor/**/*"]}
+AllCops: {TargetRubyVersion: 2.6, Exclude: ["spec/dummy/**/*", "sandbox/**/*", "vendor/**/*"]}
 
 Layout/ArgumentAlignment: {EnforcedStyle: with_fixed_indentation}
 Layout/DotPosition: {Enabled: false, StyleGuide: "https://relaxed.ruby.style/#layoutdotposition"}
diff --git a/lib/solidus_dev_support/templates/extension/Gemfile b/lib/solidus_dev_support/templates/extension/Gemfile
index 5510b62e..13194bd7 100644
--- a/lib/solidus_dev_support/templates/extension/Gemfile
+++ b/lib/solidus_dev_support/templates/extension/Gemfile
@@ -10,11 +10,6 @@ gem 'solidus', github: 'solidusio/solidus', branch: branch
 gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'master'
 gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem
 
-# Needed to help Bundler figure out how to resolve dependencies,
-# otherwise it takes forever to resolve them.
-# See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
-
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise'
 
diff --git a/lib/solidus_dev_support/templates/extension/extension.gemspec.tt b/lib/solidus_dev_support/templates/extension/extension.gemspec.tt
index 1f09acd6..9928c578 100644
--- a/lib/solidus_dev_support/templates/extension/extension.gemspec.tt
+++ b/lib/solidus_dev_support/templates/extension/extension.gemspec.tt
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = '<%= gemspec.metadata["source_code_uri"] %>'
   spec.metadata['changelog_uri'] = '<%= gemspec.metadata["changelog_uri"] %>'
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6', '< 4')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
diff --git a/solidus_dev_support.gemspec b/solidus_dev_support.gemspec
index 0a0e5510..e9778893 100644
--- a/solidus_dev_support.gemspec
+++ b/solidus_dev_support.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_dev_support/blob/master/CHANGELOG.md'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.6'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.