diff --git a/Gemfile b/Gemfile
index 609895b36..5df5cc6e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,10 +16,6 @@ gem 'ffi', '> 1.15.5'
 gem 'rake', '> 12'
 gem 'rubocop', '~> 1.28.2'
 
-if RUBY_VERSION.to_f > 3.3
-  gem 'cucumber', git: 'https://github.com/cucumber/cucumber-ruby', branch: 'main'
-end
-
 custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
 eval_gemfile custom_gemfile if File.exist?(custom_gemfile)
 
diff --git a/Gemfile-rails-dependencies b/Gemfile-rails-dependencies
index cd70375a7..21a8eede9 100644
--- a/Gemfile-rails-dependencies
+++ b/Gemfile-rails-dependencies
@@ -48,7 +48,8 @@ when nil, false, ""
   gem 'selenium-webdriver', require: false
 else
   version_number = version.split(' ').last
-  add_net_gems_dependency if version_number < '7.0'
+
+  gem 'concurrent-ruby', '1.3.4' if version_number < '7.1'
 
   gem "rails", version
   gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
diff --git a/example_app_generator/spec/support/default_preview_path b/example_app_generator/spec/support/default_preview_path
index 6ce03ef52..98ee5acf7 100755
--- a/example_app_generator/spec/support/default_preview_path
+++ b/example_app_generator/spec/support/default_preview_path
@@ -7,6 +7,7 @@ end
 ENV['RAILS_ENV'] ||= 'development'
 # Pick the frameworks you want:
 begin
+  require "openssl"
   require "active_storage"
   require "active_storage/engine"
 rescue LoadError
diff --git a/example_app_generator/spec/verify_mailer_preview_path_spec.rb b/example_app_generator/spec/verify_mailer_preview_path_spec.rb
index 68bb840a4..d045d4c3e 100644
--- a/example_app_generator/spec/verify_mailer_preview_path_spec.rb
+++ b/example_app_generator/spec/verify_mailer_preview_path_spec.rb
@@ -40,12 +40,6 @@ def capture_exec(*ops)
     CaptureExec.new(out, $?.exitstatus)
   end
 
-  if ENV['RAILS_VERSION'] == 'main' && Rails::VERSION::STRING == "8.0.0.alpha"
-    before do
-      skip('This is broken on Rails main but is skipped for green builds, please fix')
-    end
-  end
-
   if Rails::VERSION::STRING.to_f >= 7.1
     let(:expected_custom_path) { "/custom/path\n#{::Rails.root}/test/mailers/previews" }
     let(:expected_rspec_path) { "#{::Rails.root}/spec/mailers/previews\n#{::Rails.root}/test/mailers/previews" }