diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 7a8e47a4f..af6718c83 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -9,14 +9,14 @@ jobs:
   Lint:
     runs-on: ubuntu-latest
     env:
-      BUNDLE_GEMFILE: gemfiles/6.1.gemfile
+      BUNDLE_GEMFILE: gemfiles/7.1.gemfile
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.6
+          ruby-version: 3.2.7
           bundler-cache: true
       # Disabled since it requires access not granted by GitHub Actions for PRs
       # - name: Danger
@@ -32,15 +32,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ '3.3', '3.2', '3.1', '3.0', 'ruby-head' ]
-        gemfile: [ '7.2', '7.1', '7.0', '6.1', 'edge' ]
-        exclude:
-          - ruby-version: '3.1'
-            gemfile: 'edge'
-          - ruby-version: '3.0'
-            gemfile: 'edge'
-          - ruby-version: '3.0'
-            gemfile: '7.2'
+        ruby-version: [ '3.4', '3.3', '3.2', 'ruby-head' ]
+        gemfile: [ '7.2', '7.1', 'edge' ]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
@@ -61,12 +54,12 @@ jobs:
         with:
           working-directory: demo
           bundler-cache: true
-          ruby-version: 3.3.2
+          ruby-version: 3.4.2
       - name: Run tests
         working-directory: demo
         run: bundle exec rake test:all
-      - name: Commit changed screenshots and other files
-        if: failure()
-        working-directory: demo
-        run: bundle exec rake commit
+      # - name: Commit changed screenshots and other files
+      #   if: failure()
+      #   working-directory: demo
+      #   run: bundle exec rake commit
 
diff --git a/.rubocop.yml b/.rubocop.yml
index f9e797b99..15e25d3ff 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,12 +1,12 @@
-require:
+plugins:
   - rubocop-performance
   - rubocop-rails
 
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 3.0
-  TargetRailsVersion: 6.1
+  TargetRubyVersion: 3.2
+  TargetRailsVersion: 7.1
   NewCops: enable
   Exclude:
     - bin/*
diff --git a/README.md b/README.md
index 3780d6c98..738be31d1 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,8 @@ Some other nice things that `bootstrap_form` does for you are:
 
 `bootstrap_form` supports at a minimum the currently supported versions of Ruby and Rails:
 
-* Ruby 3.0+ (https://www.ruby-lang.org/en/downloads/branches/)
-* Rails 6.1+ (https://guides.rubyonrails.org/maintenance_policy.html)
+* Ruby 3.2+ (https://www.ruby-lang.org/en/downloads/branches/)
+* Rails 7.1+ (https://guides.rubyonrails.org/maintenance_policy.html)
 * Bootstrap 5.0+
 
 ## Installation
diff --git a/bootstrap_form.gemspec b/bootstrap_form.gemspec
index 4118aaf8e..9cfabe09b 100644
--- a/bootstrap_form.gemspec
+++ b/bootstrap_form.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 3.0"
+  s.required_ruby_version = ">= 3.2"
 
   s.add_dependency("actionpack", BootstrapForm::REQUIRED_RAILS_VERSION)
   s.add_dependency("activemodel", BootstrapForm::REQUIRED_RAILS_VERSION)
diff --git a/demo/.ruby-version b/demo/.ruby-version
index 14dbd3772..fb72f061b 100644
--- a/demo/.ruby-version
+++ b/demo/.ruby-version
@@ -1 +1 @@
-ruby-3.0.6
+ruby-3.2.7
diff --git a/demo/Gemfile.lock b/demo/Gemfile.lock
index 410156e63..fa74e11de 100644
--- a/demo/Gemfile.lock
+++ b/demo/Gemfile.lock
@@ -2,35 +2,35 @@ PATH
   remote: ..
   specs:
     bootstrap_form (5.4.0)
-      actionpack (>= 6.1)
-      activemodel (>= 6.1)
+      actionpack (>= 7.1)
+      activemodel (>= 7.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
+    actioncable (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.1)
-      actionpack (= 7.2.1)
-      activejob (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionmailbox (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.1)
-      actionpack (= 7.2.1)
-      actionview (= 7.2.1)
-      activejob (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionmailer (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      actionview (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.1)
-      actionview (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionpack (7.2.2.1)
+      actionview (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -39,36 +39,37 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.1)
-      actionpack (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    actiontext (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.1)
-      activesupport (= 7.2.1)
+    actionview (7.2.2.1)
+      activesupport (= 7.2.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.1)
-      activesupport (= 7.2.1)
+    activejob (7.2.2.1)
+      activesupport (= 7.2.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.1)
-      activesupport (= 7.2.1)
-    activerecord (7.2.1)
-      activemodel (= 7.2.1)
-      activesupport (= 7.2.1)
+    activemodel (7.2.2.1)
+      activesupport (= 7.2.2.1)
+    activerecord (7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.1)
-      actionpack (= 7.2.1)
-      activejob (= 7.2.1)
-      activerecord (= 7.2.1)
-      activesupport (= 7.2.1)
+    activestorage (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       marcel (~> 1.0)
-    activesupport (7.2.1)
+    activesupport (7.2.2.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -81,7 +82,8 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
@@ -95,28 +97,29 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-screenshot-diff (1.9.0)
-      actionpack (>= 6.1, < 8)
+    capybara-screenshot-diff (1.10.2)
+      actionpack (>= 7.0, < 9)
       capybara (>= 2, < 4)
     chunky_png (1.4.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crass (1.0.6)
-    cssbundling-rails (1.4.1)
+    cssbundling-rails (1.4.3)
       railties (>= 6.0.0)
-    date (3.3.4)
-    debug (1.9.2)
+    date (3.4.1)
+    debug (1.10.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     drb (2.2.1)
-    erubi (1.13.0)
+    erubi (1.13.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
     htmlbeautifier (1.4.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.14.1)
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)
@@ -124,8 +127,8 @@ GEM
       activesupport (>= 5.0.0)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    logger (1.6.1)
-    loofah (2.22.0)
+    logger (1.6.6)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -136,83 +139,89 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     mini_mime (1.1.5)
-    minitest (5.25.1)
-    msgpack (1.7.3)
-    net-imap (0.4.17)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
+    msgpack (1.8.0)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.16.7-aarch64-linux)
+    nio4r (2.7.4)
+    nokogiri (1.18.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm-linux)
+    nokogiri (1.18.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.18.3-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86-linux)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.18.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    psych (5.1.2)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.3)
+      date
       stringio
     public_suffix (6.0.1)
-    puma (6.4.3)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.8)
-    rack-session (2.0.0)
+    rack (3.1.12)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
-    rails (7.2.1)
-      actioncable (= 7.2.1)
-      actionmailbox (= 7.2.1)
-      actionmailer (= 7.2.1)
-      actionpack (= 7.2.1)
-      actiontext (= 7.2.1)
-      actionview (= 7.2.1)
-      activejob (= 7.2.1)
-      activemodel (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    rails (7.2.2.1)
+      actioncable (= 7.2.2.1)
+      actionmailbox (= 7.2.2.1)
+      actionmailer (= 7.2.2.1)
+      actionpack (= 7.2.2.1)
+      actiontext (= 7.2.2.1)
+      actionview (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.1)
+      railties (= 7.2.2.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rake (13.2.1)
-    rdoc (6.7.0)
+    rdoc (6.12.0)
       psych (>= 4.0.0)
-    regexp_parser (2.9.2)
-    reline (0.5.10)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
       io-console (~> 0.5)
-    rexml (3.3.8)
-    rubyzip (2.3.2)
-    securerandom (0.3.1)
-    selenium-webdriver (4.25.0)
+    rexml (3.4.1)
+    rubyzip (2.4.1)
+    securerandom (0.4.1)
+    selenium-webdriver (4.29.1)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -225,31 +234,31 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    sqlite3 (2.1.0-aarch64-linux-gnu)
-    sqlite3 (2.1.0-arm-linux-gnu)
-    sqlite3 (2.1.0-arm64-darwin)
-    sqlite3 (2.1.0-x86-linux-gnu)
-    sqlite3 (2.1.0-x86_64-darwin)
-    sqlite3 (2.1.0-x86_64-linux-gnu)
-    stringio (3.1.1)
+    sqlite3 (2.6.0-aarch64-linux-gnu)
+    sqlite3 (2.6.0-arm-linux-gnu)
+    sqlite3 (2.6.0-arm64-darwin)
+    sqlite3 (2.6.0-x86-linux-gnu)
+    sqlite3 (2.6.0-x86_64-darwin)
+    sqlite3 (2.6.0-x86_64-linux-gnu)
+    stringio (3.1.5)
     thor (1.3.2)
-    timeout (0.4.1)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    useragent (0.16.10)
+    useragent (0.16.11)
     web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webrick (1.8.2)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.0)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   aarch64-linux
diff --git a/demo/app/helpers/bootstrap_helper.rb b/demo/app/helpers/bootstrap_helper.rb
index a69c77156..b28a0573d 100644
--- a/demo/app/helpers/bootstrap_helper.rb
+++ b/demo/app/helpers/bootstrap_helper.rb
@@ -1,6 +1,6 @@
 module BootstrapHelper
-  def form_with_source(&block)
-    form_html = capture(&block)
+  def form_with_source(&)
+    form_html = capture(&)
 
     tag.div(class: "example") do
       concat(form_html)
diff --git a/demo/app/models/user.rb b/demo/app/models/user.rb
index 67a627e1f..fea3172bf 100644
--- a/demo/app/models/user.rb
+++ b/demo/app/models/user.rb
@@ -13,7 +13,7 @@ class User < ApplicationRecord
   has_one :address
   accepts_nested_attributes_for :address
 
-  has_rich_text(:life_story) if Rails::VERSION::STRING > "6"
+  has_rich_text(:life_story)
 
   def always
     true
diff --git a/demo/app/views/bootstrap/form.html.erb b/demo/app/views/bootstrap/form.html.erb
index 74d8bf654..105e462e4 100644
--- a/demo/app/views/bootstrap/form.html.erb
+++ b/demo/app/views/bootstrap/form.html.erb
@@ -48,7 +48,7 @@
     <%= form.password_field :password, placeholder: "Password" %>
     <%= form.check_box :terms, label: "Agree to Terms" %>
     <%= form.collection_check_boxes :misc, @collection, :id, :street %>
-    <%= form.rich_text_area(:life_story) if Rails::VERSION::STRING > "6" %>
+    <%= form.rich_text_area(:life_story) %>
     <%= form.submit %>
   <% end %>
 <% end %>
diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile
deleted file mode 100644
index fc548c835..000000000
--- a/gemfiles/6.1.gemfile
+++ /dev/null
@@ -1,10 +0,0 @@
-gems = "#{__dir__}/common.gemfile"
-eval File.read(gems), binding, gems # rubocop: disable Security/Eval
-
-gem "base64" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "logger" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "rails", "~> 6.1.0"
-gem "sqlite3", "~> 1.4"
diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile
deleted file mode 100644
index 2a3524da2..000000000
--- a/gemfiles/7.0.gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-gems = "#{__dir__}/common.gemfile"
-eval File.read(gems), binding, gems # rubocop: disable Security/Eval
-
-gem "base64" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "logger" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "rails", "~> 7.0.2"
-gem "sprockets-rails", require: "sprockets/railtie"
-gem "sqlite3", "~> 1.4"
diff --git a/gemfiles/common.gemfile b/gemfiles/common.gemfile
index cefcfad56..f65c6ff5f 100644
--- a/gemfiles/common.gemfile
+++ b/gemfiles/common.gemfile
@@ -19,7 +19,7 @@ end
 
 group :development, :test do
   gem "debug"
-  gem "pry-byebug"
+  gem "ostruct" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.5.0")
 end
 
 group :ci do
diff --git a/lib/bootstrap_form/action_view_extensions/form_helper.rb b/lib/bootstrap_form/action_view_extensions/form_helper.rb
index c60b8bcf3..a0ebf1620 100644
--- a/lib/bootstrap_form/action_view_extensions/form_helper.rb
+++ b/lib/bootstrap_form/action_view_extensions/form_helper.rb
@@ -33,20 +33,20 @@ def bootstrap_form_with(options={}, &block)
         end
       end
 
-      def bootstrap_form_tag(options={}, &block)
+      def bootstrap_form_tag(options={}, &)
         options[:acts_like_form_tag] = true
 
-        bootstrap_form_for("", options, &block)
+        bootstrap_form_for("", options, &)
       end
 
-      def bootstrap_fields_for(record_name, record_object=nil, options={}, &block)
+      def bootstrap_fields_for(record_name, record_object=nil, options={}, &)
         options[:builder] = BootstrapForm::FormBuilder
-        fields_for(record_name, record_object, options, &block)
+        fields_for(record_name, record_object, options, &)
       end
 
-      def bootstrap_fields(scope=nil, model: nil, **options, &block)
+      def bootstrap_fields(scope=nil, model: nil, **options, &)
         options[:builder] = BootstrapForm::FormBuilder
-        fields(scope, model: model, **options, &block)
+        fields(scope, model: model, **options, &)
       end
 
       private
diff --git a/lib/bootstrap_form/components/labels.rb b/lib/bootstrap_form/components/labels.rb
index f496d80fa..579957ed8 100644
--- a/lib/bootstrap_form/components/labels.rb
+++ b/lib/bootstrap_form/components/labels.rb
@@ -43,7 +43,7 @@ def label_layout_classes(custom_label_col, group_layout)
       end
 
       def label_text(name, options)
-        label = options[:text] || object&.class&.try(:human_attribute_name, name)&.html_safe # rubocop:disable Rails/OutputSafety
+        label = options[:text] || object&.class&.try(:human_attribute_name, name)&.html_safe # rubocop:disable Rails/OutputSafety, Style/SafeNavigationChainLength
         if label_errors && error?(name)
           (" ".html_safe + get_error_messages(name)).prepend(label)
         else
diff --git a/lib/bootstrap_form/form_builder.rb b/lib/bootstrap_form/form_builder.rb
index fbc2fcf94..c4b425479 100644
--- a/lib/bootstrap_form/form_builder.rb
+++ b/lib/bootstrap_form/form_builder.rb
@@ -72,10 +72,10 @@ def add_default_form_attributes_and_form_inline(options)
         .compact.uniq, " ")
     end
 
-    def fields_for_with_bootstrap(record_name, record_object=nil, fields_options={}, &block)
+    def fields_for_with_bootstrap(record_name, record_object=nil, fields_options={}, &)
       fields_options = fields_for_options(record_object, fields_options)
       record_object = nil if record_object.is_a?(Hash) && record_object.extractable_options?
-      fields_for_without_bootstrap(record_name, record_object, fields_options, &block)
+      fields_for_without_bootstrap(record_name, record_object, fields_options, &)
     end
 
     bootstrap_alias :fields_for
@@ -92,7 +92,7 @@ def fields_for_options(record_object, fields_options)
       %i[layout control_col inline_errors label_errors].each do |option|
         field_options[option] ||= options[option]
       end
-      field_options[:label_col] = field_options[:label_col].present? ? (field_options[:label_col]).to_s : options[:label_col]
+      field_options[:label_col] = field_options[:label_col].present? ? field_options[:label_col].to_s : options[:label_col]
       field_options
     end
 
diff --git a/lib/bootstrap_form/form_group.rb b/lib/bootstrap_form/form_group.rb
index c06a7e9c9..5039aa71a 100644
--- a/lib/bootstrap_form/form_group.rb
+++ b/lib/bootstrap_form/form_group.rb
@@ -29,15 +29,15 @@ def form_group_content_tag(name, field_name, without_field_name, options, html_o
       end
     end
 
-    def form_group_content(label, help_text, options, &block) # rubocop:disable Metrics/AbcSize
+    def form_group_content(label, help_text, options, &) # rubocop:disable Metrics/AbcSize
       label ||= ActiveSupport::SafeBuffer.new
       if group_layout_horizontal?(options[:layout])
-        label + tag.div(capture(&block) + help_text, class: form_group_control_class(options))
+        label + tag.div(capture(&) + help_text, class: form_group_control_class(options))
       else
         content = ActiveSupport::SafeBuffer.new
         # Floating labels need to be rendered after the field
         content << label unless options[:floating]
-        content << capture(&block)
+        content << capture(&)
         content << label if options[:floating]
         content << help_text if help_text
         content
diff --git a/lib/bootstrap_form/form_group_builder.rb b/lib/bootstrap_form/form_group_builder.rb
index c465c1d7c..79eff7e56 100644
--- a/lib/bootstrap_form/form_group_builder.rb
+++ b/lib/bootstrap_form/form_group_builder.rb
@@ -6,7 +6,7 @@ module FormGroupBuilder
 
     private
 
-    def form_group_builder(method, options, html_options=nil, &block)
+    def form_group_builder(method, options, html_options=nil, &)
       no_wrapper = options[:wrapper] == false
 
       options = form_group_builder_options(options, method)
@@ -21,7 +21,7 @@ def form_group_builder(method, options, html_options=nil, &block)
       if no_wrapper
         yield
       else
-        form_group(method, form_group_options, &block)
+        form_group(method, form_group_options, &)
       end
     end
 
diff --git a/lib/bootstrap_form/helpers/bootstrap.rb b/lib/bootstrap_form/helpers/bootstrap.rb
index 38934b235..3ed6bf13c 100644
--- a/lib/bootstrap_form/helpers/bootstrap.rb
+++ b/lib/bootstrap_form/helpers/bootstrap.rb
@@ -56,17 +56,17 @@ def static_control(*args)
         text_field_with_bootstrap(name, static_options)
       end
 
-      def custom_control(*args, &block)
+      def custom_control(*args, &)
         options = args.extract_options!
         name = args.first
 
-        form_group_builder(name, options, &block)
+        form_group_builder(name, options, &)
       end
 
-      def prepend_and_append_input(name, options, &block)
+      def prepend_and_append_input(name, options, &)
         options = options.extract!(:prepend, :append, :input_group_class).compact
 
-        input = capture(&block) || ActiveSupport::SafeBuffer.new
+        input = capture(&) || ActiveSupport::SafeBuffer.new
 
         input = attach_input(options, :prepend) + input + attach_input(options, :append)
         input << generate_error(name)
@@ -75,8 +75,8 @@ def prepend_and_append_input(name, options, &block)
         input
       end
 
-      def input_with_error(name, &block)
-        input = capture(&block)
+      def input_with_error(name, &)
+        input = capture(&)
         input << generate_error(name)
       end
 
diff --git a/lib/bootstrap_form/inputs/check_box.rb b/lib/bootstrap_form/inputs/check_box.rb
index b095b75d6..eb2a2cff0 100644
--- a/lib/bootstrap_form/inputs/check_box.rb
+++ b/lib/bootstrap_form/inputs/check_box.rb
@@ -42,7 +42,7 @@ def check_box_options(name, options)
         check_box_options.merge!(required_field_options(options, name))
       end
 
-      def check_box_label(name, options, checked_value, &block)
+      def check_box_label(name, options, checked_value, &)
         label_name = if options[:multiple]
                        check_box_value(name, checked_value)
                      else
@@ -50,7 +50,7 @@ def check_box_label(name, options, checked_value, &block)
                      end
         label_options = { class: check_box_label_class(options) }
         label_options[:for] = options[:id] if options[:id].present?
-        label(label_name, check_box_description(name, options, &block), label_options)
+        label(label_name, check_box_description(name, options, &), label_options)
       end
 
       def check_box_description(name, options, &block)
diff --git a/lib/bootstrap_form/inputs/submit.rb b/lib/bootstrap_form/inputs/submit.rb
index 272b0795b..cddad6636 100644
--- a/lib/bootstrap_form/inputs/submit.rb
+++ b/lib/bootstrap_form/inputs/submit.rb
@@ -1,7 +1,7 @@
 module BootstrapForm
   module Inputs
     module Submit
-      def button(value=nil, options={}, &block)
+      def button(value=nil, options={}, &)
         value = setup_css_class "btn btn-secondary", value, options
         super
       end
diff --git a/lib/bootstrap_form/version.rb b/lib/bootstrap_form/version.rb
index 309980fa2..2b3d295c5 100644
--- a/lib/bootstrap_form/version.rb
+++ b/lib/bootstrap_form/version.rb
@@ -1,4 +1,4 @@
 module BootstrapForm
   VERSION = "5.4.0".freeze
-  REQUIRED_RAILS_VERSION = ">= 6.1".freeze
+  REQUIRED_RAILS_VERSION = ">= 7.1".freeze
 end
diff --git a/test/bootstrap_checkbox_test.rb b/test/bootstrap_checkbox_test.rb
index 7fb61ce6e..6fdfd4549 100644
--- a/test/bootstrap_checkbox_test.rb
+++ b/test/bootstrap_checkbox_test.rb
@@ -124,7 +124,6 @@ class BootstrapCheckboxTest < ActionView::TestCase
   test "inline checkboxes from form layout" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user row row-cols-auto g-3 align-items-center" id="new_user" method="post">
-      #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="col">
           <div class="form-check form-check-inline">
             <input #{autocomplete_attr} name="user[terms]" type="hidden" value="0" />
@@ -519,8 +518,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
-        <input #{autocomplete_attr} id="user_misc" name="user[misc][]" type="hidden" value="" />
+          <input #{autocomplete_attr} id="user_misc" name="user[misc][]" type="hidden" value="" />
         <div class="mb-3">
           <label class="form-label" for="user_misc">Misc</label>
           <div class="form-check">
@@ -570,8 +568,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
     collection = [Address.new(id: 1, street: "Foo"), Address.new(id: 2, street: "Bar")]
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
-        <input #{autocomplete_attr} id="user_misc" name="user[misc][]" type="hidden" value="" />
+          <input #{autocomplete_attr} id="user_misc" name="user[misc][]" type="hidden" value="" />
         <div class="mb-3">
           <label class="form-label" for="user_misc">Misc</label>
           <div class="form-check">
@@ -597,8 +594,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
     @user.errors.add(:terms, "You must accept the terms.")
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
-        <div class="form-check mb-3">
+          <div class="form-check mb-3">
           <input #{autocomplete_attr} name="user[terms]" type="hidden" value="0" />
           <input class="form-check-input is-invalid" id="user_terms" name="user[terms]" type="checkbox" value="1" />
           <label class="form-check-label" for="user_terms">
diff --git a/test/bootstrap_fields_for_test.rb b/test/bootstrap_fields_for_test.rb
index 736088b72..4dc072dc0 100644
--- a/test/bootstrap_fields_for_test.rb
+++ b/test/bootstrap_fields_for_test.rb
@@ -16,7 +16,6 @@ class BootstrapFieldsForTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="address_street">Street</label>
           <input class="form-control" id="address_street" name="address[street]" type="text" value="123 Main Street" />
@@ -37,7 +36,6 @@ class BootstrapFieldsForTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="preferences_favorite_color">Favorite color</label>
           <input class="form-control" id="preferences_favorite_color" name="preferences[favorite_color]" type="text" value="cerulean" />
@@ -58,7 +56,6 @@ class BootstrapFieldsForTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="address_street">Street</label>
           <input class="form-control" id="address_street" name="address[street]" type="text" value="123 Main Street" />
@@ -79,7 +76,6 @@ class BootstrapFieldsForTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="preferences_favorite_color">Favorite color</label>
           <input class="form-control" id="preferences_favorite_color" name="preferences[favorite_color]" type="text" value="cerulean" />
diff --git a/test/bootstrap_fields_test.rb b/test/bootstrap_fields_test.rb
index 6455503ae..8d39d9d74 100644
--- a/test/bootstrap_fields_test.rb
+++ b/test/bootstrap_fields_test.rb
@@ -29,7 +29,7 @@ class BootstrapFieldsTest < ActionView::TestCase
     expected = <<~HTML
       <div class="mb-3">
         <label class="form-label" for="user_misc">Misc</label>
-        <input class="form-control" id="user_misc" name="user[misc]" type="datetime" />
+        <input class="form-control" id="user_misc" name="user[misc]" type="datetime-local" />
       </div>
     HTML
     assert_equivalent_html expected, @builder.datetime_field(:misc)
@@ -89,7 +89,6 @@ class BootstrapFieldsTest < ActionView::TestCase
     @user.errors.add(:misc, "error for test")
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" enctype="multipart/form-data" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="user_misc">Misc</label>
           <input class="form-control is-invalid" id="user_misc" name="user[misc]" type="file"/>
@@ -105,7 +104,6 @@ class BootstrapFieldsTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_address"  id="new_address" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required" for="address_user_id">User</label>
           <input class="form-control is-invalid" id="address_user_id" name="address[user_id]" required="required" type="text"/>
@@ -359,7 +357,6 @@ class BootstrapFieldsTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="user_address_attributes_street">Street</label>
           <input class="form-control" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="123 Main Street" />
@@ -380,7 +377,6 @@ class BootstrapFieldsTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="user_preferences_favorite_color">Favorite color</label>
           <input class="form-control" id="user_preferences_favorite_color" name="user[preferences][favorite_color]" type="text" value="cerulean" />
@@ -401,7 +397,6 @@ class BootstrapFieldsTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <label class="col-form-label col-sm-2" for="user_address_attributes_street">Street</label>
           <div class="col-sm-10">
@@ -425,7 +420,6 @@ class BootstrapFieldsTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user row row-cols-auto g-3 align-items-center" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="col">
           <label class="form-label me-sm-2" for="user_address_attributes_street">Street</label>
           <input class="form-control" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="123 Main Street" />
diff --git a/test/bootstrap_form_group_test.rb b/test/bootstrap_form_group_test.rb
index c206358cb..47abc7b75 100644
--- a/test/bootstrap_form_group_test.rb
+++ b/test/bootstrap_form_group_test.rb
@@ -181,7 +181,6 @@ class BootstrapFormGroupTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required" for="user_email">Email</label>
           <div class="input-group">
@@ -423,7 +422,6 @@ class BootstrapFormGroupTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <div class="form-check">
             <input class="form-check-input is-invalid" id="user_misc_primary_school" name="user[misc]" type="radio" value="primary school"/>
@@ -483,7 +481,6 @@ class BootstrapFormGroupTest < ActionView::TestCase
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="none-margin">
           <label class="form-label required" for="user_email">Email</label>
           <input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
@@ -600,7 +597,6 @@ class BootstrapFormGroupTest < ActionView::TestCase
   test "custom form group layout option" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 col-auto g-3">
           <label class="form-label me-sm-2 required" for="user_email">Email</label>
           <input required="required" class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com" />
diff --git a/test/bootstrap_form_test.rb b/test/bootstrap_form_test.rb
index 10628e970..9bc0605e9 100644
--- a/test/bootstrap_form_test.rb
+++ b/test/bootstrap_form_test.rb
@@ -8,7 +8,6 @@ class BootstrapFormTest < ActionView::TestCase
   test "default-style forms" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
       </form>
     HTML
     assert_equivalent_html expected, bootstrap_form_for(@user) { |_f| nil }
@@ -17,7 +16,6 @@ class BootstrapFormTest < ActionView::TestCase
   test "default-style form fields layout horizontal" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <label class="col-form-label col-sm-2 required" for="user_email">Email</label>
           <div class="col-sm-10">
@@ -69,7 +67,6 @@ class BootstrapFormTest < ActionView::TestCase
   test "default-style form fields layout inline" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 col-auto g-3">
           <label class="form-label me-sm-2 required" for="user_email">Email</label>
           <input required="required" class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com" />
@@ -115,10 +112,9 @@ class BootstrapFormTest < ActionView::TestCase
     # TODO: Align baseline better.
   end
 
-  test "default-style forms bootstrap_form_with Rails 5.1+" do
+  test "default-style forms bootstrap_form_with Rails 7.1+" do
     expected = <<~HTML
-      <form accept-charset="UTF-8" action="/users" method="post" #{'data-remote="true"' if ::Rails::VERSION::STRING < '6.1'}>
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
+      <form accept-charset="UTF-8" action="/users" method="post">
       </form>
     HTML
     assert_equivalent_html expected, bootstrap_form_with(model: @user) { |_f| nil }
@@ -127,7 +123,6 @@ class BootstrapFormTest < ActionView::TestCase
   test "inline-style forms" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user row row-cols-auto g-3 align-items-center" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="col">
           <label class="form-label me-sm-2 required" for="user_email">Email</label>
           <input required="required" class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com" />
@@ -174,7 +169,6 @@ class BootstrapFormTest < ActionView::TestCase
   test "horizontal-style forms" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <label class="col-form-label col-sm-2 required" for="user_email">Email</label>
           <div class="col-sm-10">
@@ -229,7 +223,6 @@ class BootstrapFormTest < ActionView::TestCase
   test "horizontal-style form fields layout vertical" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required" for="user_email">Email</label>
           <input required="required" class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com" />
@@ -279,7 +272,6 @@ class BootstrapFormTest < ActionView::TestCase
   test "horizontal-style form fields layout inline" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 col-auto g-3">
           <label class="form-label me-sm-2 required" for="user_email">Email</label>
           <input required="required" class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com" />
@@ -329,7 +321,6 @@ class BootstrapFormTest < ActionView::TestCase
   test "existing styles aren't clobbered when specifying a form style" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="my-style" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <label class="col-form-label col-sm-2 required" for="user_email">Email</label>
           <div class="col-sm-10">
@@ -378,7 +369,6 @@ def warn(message, ...)
   test "given role attribute should not be covered by default role attribute" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="not-a-form">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
       </form>
     HTML
     assert_equivalent_html expected, bootstrap_form_for(@user, html: { role: "not-a-form" }) { |_f| nil }
@@ -388,7 +378,6 @@ def warn(message, ...)
     BootstrapForm.config.stubs(:default_form_attributes).returns({})
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
       </form>
     HTML
     assert_equivalent_html expected, bootstrap_form_for(@user) { |_f| nil }
@@ -398,7 +387,6 @@ def warn(message, ...)
     BootstrapForm.config.stubs(:default_form_attributes).returns(foo: "bar")
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" foo="bar" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
       </form>
     HTML
     assert_equivalent_html expected, bootstrap_form_for(@user) { |_f| nil }
@@ -407,7 +395,6 @@ def warn(message, ...)
   test "bootstrap_form_tag acts like a form tag" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="email">Your Email</label>
           <input class="form-control" id="email" name="email" type="text" />
@@ -421,7 +408,6 @@ def warn(message, ...)
   test "bootstrap_form_for does not clobber custom options" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required" for="ID">Email</label>
           <input required="required" class="form-control" id="ID" name="NAME" type="text" value="steve@example.com" />
@@ -434,7 +420,6 @@ def warn(message, ...)
   test "bootstrap_form_tag does not clobber custom options" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="ID">Email</label>
           <input class="form-control" id="ID" name="NAME" type="text" />
@@ -447,7 +432,6 @@ def warn(message, ...)
   test "bootstrap_form_tag allows an empty name for checkboxes" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="form-check mb-3">
           <input #{autocomplete_attr} name="misc" type="hidden" value="0" />
           <input class="form-check-input" id="misc" name="misc" type="checkbox" value="1" />
@@ -464,7 +448,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required text-danger" for="user_email">Email can't be blank, is too short (minimum is 5 characters)</label>
           <input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
@@ -480,7 +463,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required text-danger" for="user_email">Email can't be blank, is too short (minimum is 5 characters)</label>
           <input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
@@ -499,7 +481,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required text-danger" for="user_email">Your e-mail address can't be blank, is too short (minimum is 5 characters)</label>
           <input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
@@ -556,7 +537,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="alert alert-danger">
           <p>Please fix the following errors:</p>
           <ul class="rails-bootstrap-forms-error-summary">
@@ -580,7 +560,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="alert alert-danger">Please fix the following errors:</div>
       </form>
     HTML
@@ -597,7 +576,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="alert alert-danger">
           <p>Please fix the following errors:</p>
           <ul class="rails-bootstrap-forms-error-summary">
@@ -645,7 +623,6 @@ def warn(message, ...)
   test "custom label width for horizontal forms" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <label class="col-form-label col-sm-1 required" for="user_email">Email</label>
           <div class="col-sm-10">
@@ -661,7 +638,6 @@ def warn(message, ...)
   test "offset for form group without label respects label width for horizontal forms" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <div class="col-md-10 offset-md-2">
             <input class="btn btn-secondary" name="commit" type="submit" value="Create User" />
@@ -677,7 +653,6 @@ def warn(message, ...)
   test "offset for form group without label respects multiple label widths for horizontal forms" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <div class="col-sm-8 col-md-10 offset-sm-4 offset-md-2">
             <input class="btn btn-secondary" name="commit" type="submit" value="Create User" />
@@ -693,7 +668,6 @@ def warn(message, ...)
   test "custom input width for horizontal forms" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <label class="col-form-label col-sm-2 required" for="user_email">Email</label>
           <div class="col-sm-5">
@@ -709,7 +683,6 @@ def warn(message, ...)
   test "additional input col class" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3 row">
           <label class="col-form-label col-sm-2 required" for="user_email">Email</label>
           <div class="col-sm-10 custom-class">
@@ -733,7 +706,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required" for="user_email">Email</label>
           <input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
@@ -755,7 +727,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <div class="field_with_errors">
             <label class="form-label required" for="user_email">Email</label>
@@ -781,7 +752,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required" for="user_email">Email</label>
           <input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
@@ -801,7 +771,6 @@ def warn(message, ...)
 
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label required" for="user_email">Email</label>
           <input required="required" class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" />
diff --git a/test/bootstrap_radio_button_test.rb b/test/bootstrap_radio_button_test.rb
index 5b22b9791..fa9226070 100644
--- a/test/bootstrap_radio_button_test.rb
+++ b/test/bootstrap_radio_button_test.rb
@@ -32,7 +32,6 @@ class BootstrapRadioButtonTest < ActionView::TestCase
     @user.errors.add(:misc, "error for test")
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="form-check">
           <input class="form-check-input is-invalid" id="user_misc_1" name="user[misc]" type="radio" value="1" />
           <label class="form-check-label" for="user_misc_1">
@@ -99,7 +98,6 @@ class BootstrapRadioButtonTest < ActionView::TestCase
   test "radio_button inline label is set correctly from form level" do
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user row row-cols-auto g-3 align-items-center" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="form-check form-check-inline">
           <input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
           <label class="form-check-label" for="user_misc_1">
@@ -184,7 +182,6 @@ class BootstrapRadioButtonTest < ActionView::TestCase
     collection = [Address.new(id: 1, street: "Foo"), Address.new(id: 2, street: "Bar")]
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="user_misc">Misc</label>
           <div class="form-check">
diff --git a/test/bootstrap_rich_text_area_test.rb b/test/bootstrap_rich_text_area_test.rb
index f95d3dad8..949a04aca 100644
--- a/test/bootstrap_rich_text_area_test.rb
+++ b/test/bootstrap_rich_text_area_test.rb
@@ -1,48 +1,36 @@
 require_relative "test_helper"
 require "minitest/mock"
 
-if Rails::VERSION::STRING > "6"
-  class BootstrapRichTextAreaTest < ActionView::TestCase
-    tests ActionText::TagHelper
-    include BootstrapForm::ActionViewExtensions::FormHelper
+class BootstrapRichTextAreaTest < ActionView::TestCase
+  tests ActionText::TagHelper
+  include BootstrapForm::ActionViewExtensions::FormHelper
 
-    setup :setup_test_fixture
+  setup :setup_test_fixture
 
-    test "rich text areas are wrapped correctly" do
-      if ::Rails::VERSION::STRING >= "7"
-        expected = nil
-        with_stub_token do
-          expected = <<~HTML
-            <div class="mb-3">
-              <label class="form-label" for="user_life_story">Life story</label>
-              <input autocomplete="off" type="hidden" name="user[life_story]" id="user_life_story_trix_input_user"/>
-              <trix-editor class="trix-content form-control" extra="extra arg" data-blob-url-template="http://test.host/rails/active_storage/blobs/redirect/:signed_id/:filename" data-direct-upload-url="http://test.host/rails/active_storage/direct_uploads" id="user_life_story" input="user_life_story_trix_input_user"/>
-            </div>
-          HTML
-        end
-      else
-        expected = <<~HTML
-          <div class="mb-3">
-            <label class="form-label" for="user_life_story">Life story</label>
-            <input #{autocomplete_attr} type="hidden" name="user[life_story]" id="user_life_story_trix_input_user"/>
-            <trix-editor id="user_life_story" extra="extra arg" data-blob-url-template="#{data_blob_url_template}" data-direct-upload-url="http://test.host/rails/active_storage/direct_uploads" input="user_life_story_trix_input_user" class="trix-content form-control" />
-          </div>
-        HTML
-      end
-      assert_equivalent_html expected, form_with_builder.rich_text_area(:life_story, extra: "extra arg")
-    end
-
-    def data_blob_url_template
-      "http://test.host/rails/active_storage/blobs/#{'redirect/' if ::Rails::VERSION::STRING >= '6.1'}:signed_id/:filename"
+  test "rich text areas are wrapped correctly" do
+    expected = nil
+    with_stub_token do
+      expected = <<~HTML
+        <div class="mb-3">
+          <label class="form-label" for="user_life_story">Life story</label>
+          <input autocomplete="off" type="hidden" name="user[life_story]" id="user_life_story_trix_input_user"/>
+          <trix-editor class="trix-content form-control" extra="extra arg" data-blob-url-template="http://test.host/rails/active_storage/blobs/redirect/:signed_id/:filename" data-direct-upload-url="http://test.host/rails/active_storage/direct_uploads" id="user_life_story" input="user_life_story_trix_input_user"/>
+        </div>
+      HTML
     end
+    assert_equivalent_html expected, form_with_builder.rich_text_area(:life_story, extra: "extra arg")
+  end
 
-    def with_stub_token(&block)
-      unless defined?(ActiveStorage::DirectUploadToken)
-        yield
-        return
-      end
+  def data_blob_url_template
+    "http://test.host/rails/active_storage/blobs/redirect/:signed_id/:filename"
+  end
 
-      ActiveStorage::DirectUploadToken.stub(:generate_direct_upload_token, "token", &block)
+  def with_stub_token(&)
+    unless defined?(ActiveStorage::DirectUploadToken)
+      yield
+      return
     end
+
+    ActiveStorage::DirectUploadToken.stub(:generate_direct_upload_token, "token", &)
   end
 end
diff --git a/test/bootstrap_selects_test.rb b/test/bootstrap_selects_test.rb
index 38ceb731a..c771e6f08 100644
--- a/test/bootstrap_selects_test.rb
+++ b/test/bootstrap_selects_test.rb
@@ -38,7 +38,6 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
     @user.errors.add(:misc, "error for test")
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="user_misc">Misc</label>
           <select class="form-select is-invalid" id="user_misc" name="user[misc]">#{time_zone_options_for_select}</select>
@@ -202,7 +201,6 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
     @user.errors.add(:status, "error for test")
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="user_status">Status</label>
           <select class="form-select is-invalid" id="user_status" name="user[status]"></select>
@@ -283,7 +281,6 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
     @user.errors.add(:status, "error for test")
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-        #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
         <div class="mb-3">
           <label class="form-label" for="user_status">Status</label>
           <select class="form-select is-invalid" id="user_status" name="user[status]"></select>
@@ -388,8 +385,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
     travel_to(Time.utc(2012, 2, 3)) do
       expected = <<~HTML
         <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-          #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
-          <div class="mb-3 row">
+            <div class="mb-3 row">
             <label class="col-form-label col-sm-2" for="user_misc">Misc</label>
             <div class="col-sm-10">
               <div class="rails-bootstrap-forms-date-select col-auto g-3">
@@ -416,8 +412,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
     travel_to(Time.utc(2012, 2, 3)) do
       expected = <<~HTML
         <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-          #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
-          <div class="mb-3">
+            <div class="mb-3">
             <label class="form-label" for="user_misc">Misc</label>
             <div class="rails-bootstrap-forms-date-select">
               <select class="form-select is-invalid" id="user_misc_1i" name="user[misc(1i)]">
@@ -517,8 +512,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
     travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<~HTML
         <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-          #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
-          <div class="mb-3">
+            <div class="mb-3">
             <label class="form-label" for="user_misc">Misc</label>
             <div class="rails-bootstrap-forms-time-select">
               <input #{autocomplete_attr} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="2012" />
@@ -625,8 +619,7 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
     travel_to(Time.utc(2012, 2, 3, 12, 0, 0)) do
       expected = <<~HTML
         <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
-          #{'<input name="utf8" type="hidden" value="&#x2713;"/>' unless ::Rails::VERSION::STRING >= '6'}
-          <div class="mb-3">
+            <div class="mb-3">
             <label class="form-label" for="user_misc">Misc</label>
             <div class="rails-bootstrap-forms-datetime-select">
               <select class="form-select is-invalid" id="user_misc_1i" name="user[misc(1i)]">
@@ -762,10 +755,6 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
   end
 
   def blank_option
-    if ::Rails::VERSION::STRING < "6.1"
-      '<option value=""></option>'
-    else
-      '<option label=" " value=""></option>'
-    end
+    '<option label=" " value=""></option>'
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index c3a9f9a4a..adf7f2782 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -85,24 +85,12 @@ def assert_equivalent_html(expected, actual)
   def equivalent_with_looser_criteria?(expected, real, result)
     return result if result
 
-    if real.attr(:name) == "utf8"
-      # Handle wrapped utf8 hidden field for Rails 4.2+
-      expected = expected.child
-    end
-
     real.delete("data-disable-with")
 
-    if expected.is_a?(Nokogiri::XML::Attr) &&
-       real.is_a?(Nokogiri::XML::Attr) &&
-       expected.value == "datetime" &&
-       real.value == "datetime-local"
-      return true
-    end
-
     EquivalentXml.equivalent?(expected, real, element_order: true)
   end
 
   def autocomplete_attr
-    'autocomplete="off"' if ::Rails::VERSION::STRING >= "6.1"
+    'autocomplete="off"'
   end
 end