diff --git a/spec/features/consumer/shopping/checkout_auth_spec.rb b/spec/features/consumer/shopping/checkout_auth_spec.rb
index 7bbb6e8922..2a9d178fc0 100644
--- a/spec/features/consumer/shopping/checkout_auth_spec.rb
+++ b/spec/features/consumer/shopping/checkout_auth_spec.rb
@@ -6,7 +6,7 @@ feature "As a consumer I want to check out my cart", js: true do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
-  include CheckoutHelper
+  include CheckoutRequestsHelper
   include UIComponentHelper
 
   describe "using the checkout" do
diff --git a/spec/features/consumer/shopping/checkout_paypal_spec.rb b/spec/features/consumer/shopping/checkout_paypal_spec.rb
index 4e8f6dce30..3135aa1d35 100644
--- a/spec/features/consumer/shopping/checkout_paypal_spec.rb
+++ b/spec/features/consumer/shopping/checkout_paypal_spec.rb
@@ -4,7 +4,7 @@ require "spec_helper"
 
 feature "Check out with Paypal", js: true do
   include ShopWorkflow
-  include CheckoutHelper
+  include CheckoutRequestsHelper
   include AuthenticationHelper
   include PaypalHelper
 
diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb
index dc2b5832ce..d9a9a855b2 100644
--- a/spec/features/consumer/shopping/checkout_spec.rb
+++ b/spec/features/consumer/shopping/checkout_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 feature "As a consumer I want to check out my cart", js: true do
   include AuthenticationHelper
   include ShopWorkflow
-  include CheckoutHelper
+  include CheckoutRequestsHelper
   include WebHelper
   include UIComponentHelper
 
diff --git a/spec/features/consumer/shopping/checkout_stripe_spec.rb b/spec/features/consumer/shopping/checkout_stripe_spec.rb
index 07e1d98607..bd98d198a9 100644
--- a/spec/features/consumer/shopping/checkout_stripe_spec.rb
+++ b/spec/features/consumer/shopping/checkout_stripe_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 feature "Check out with Stripe", js: true do
   include AuthenticationHelper
   include ShopWorkflow
-  include CheckoutHelper
+  include CheckoutRequestsHelper
   include StripeHelper
   include StripeStubs
 
diff --git a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
index ff15d4a46d..cd6ba81484 100644
--- a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
+++ b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
@@ -7,7 +7,7 @@ feature "Using embedded shopfront functionality", js: true do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
-  include CheckoutHelper
+  include CheckoutRequestsHelper
   include UIComponentHelper
 
   describe "using iframes" do
diff --git a/spec/features/consumer/shopping/variant_overrides_spec.rb b/spec/features/consumer/shopping/variant_overrides_spec.rb
index ce8efc02ae..ce093f1c64 100644
--- a/spec/features/consumer/shopping/variant_overrides_spec.rb
+++ b/spec/features/consumer/shopping/variant_overrides_spec.rb
@@ -6,7 +6,7 @@ feature "shopping with variant overrides defined", js: true do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
-  include CheckoutHelper
+  include CheckoutRequestsHelper
   include UIComponentHelper
 
   let(:hub) { create(:distributor_enterprise, with_payment_and_shipping: true) }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c4280c90e4..39f1441214 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -184,7 +184,6 @@ RSpec.configure do |config|
   # Helpers
   config.include Rails.application.routes.url_helpers
   config.include Spree::UrlHelpers
-  config.include Spree::CheckoutHelpers
   config.include Spree::MoneyHelper
   config.include PreferencesHelper
   config.include ControllerRequestsHelper, type: :controller
diff --git a/spec/support/request/checkout_helper.rb b/spec/support/request/checkout_request_helper.rb
similarity index 97%
rename from spec/support/request/checkout_helper.rb
rename to spec/support/request/checkout_request_helper.rb
index e27ffd27ed..3a6de815bd 100644
--- a/spec/support/request/checkout_helper.rb
+++ b/spec/support/request/checkout_request_helper.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module CheckoutHelper
+module CheckoutRequestsHelper
   def have_checkout_details
     have_content "Your details"
   end
diff --git a/spec/support/spree/checkout_helpers.rb b/spec/support/spree/checkout_helpers.rb
deleted file mode 100644
index 7731fe3822..0000000000
--- a/spec/support/spree/checkout_helpers.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module CheckoutHelpers
-    def click_checkout_continue_button
-      page.find('#add_new_save_checkout_button input[type=submit]').click
-    end
-  end
-end
diff --git a/spec/views/spree/shared/_order_details.html.haml_spec.rb b/spec/views/spree/shared/_order_details.html.haml_spec.rb
index d1b7986203..5a37c4519e 100644
--- a/spec/views/spree/shared/_order_details.html.haml_spec.rb
+++ b/spec/views/spree/shared/_order_details.html.haml_spec.rb
@@ -5,6 +5,8 @@ require "spec_helper"
 describe "spree/shared/_order_details.html.haml" do
   include AuthenticationHelper
   helper Spree::BaseHelper
+  helper CheckoutHelper
+  helper OrderHelper
 
   let(:order) { create(:completed_order_with_fees) }
 
@@ -12,7 +14,7 @@ describe "spree/shared/_order_details.html.haml" do
     assign(:order, order)
     allow(view).to receive_messages(
       order: order,
-      current_order: order,
+      current_order: order
     )
   end