diff --git a/config/application.rb b/config/application.rb
index 644e5c41352..c2187f942c9 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,7 +9,7 @@
 require "action_mailer/railtie"
 require "action_view/railtie"
 
-require "action_view/component"
+require "view_component/engine"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 3680292e1fb..3011de2aa48 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -6,7 +6,7 @@
 abort('The Rails environment is running in production mode!') if Rails.env.production?
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
-require 'action_view/component/test_helpers'
+require 'view_component/test_helpers'
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end
@@ -69,7 +69,7 @@
 
   config.include FactoryBot::Syntax::Methods
 
-  config.include ActionView::Component::TestHelpers
+  config.include ViewComponent::TestHelpers, type: :component
 
   config.before { Faker::UniqueGenerator.clear }