diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index b25dd490f2..299a8738ff 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'open_food_network/address_finder'
-require 'spree/core/gateway_error'
 
 class CheckoutController < Spree::StoreController
   layout 'darkswarm'
diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb
index 56dc8b0ed7..0b41e7003c 100644
--- a/app/controllers/spree/admin/orders_controller.rb
+++ b/app/controllers/spree/admin/orders_controller.rb
@@ -3,7 +3,6 @@ require 'open_food_network/spree_api_key_loader'
 module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
-      require 'spree/core/gateway_error'
       include OpenFoodNetwork::SpreeApiKeyLoader
       helper CheckoutHelper
 
diff --git a/lib/spree/core.rb b/lib/spree/core.rb
index f0943bef92..e3ef713db7 100644
--- a/lib/spree/core.rb
+++ b/lib/spree/core.rb
@@ -50,6 +50,7 @@ require 'spree/core/permalinks'
 require 'spree/core/token_resource'
 require 'spree/core/calculated_adjustments'
 require 'spree/core/product_duplicator'
+require 'spree/core/gateway_error'
 
 ActiveRecord::Base.class_eval do
   include CollectiveIdea::Acts::NestedSet
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
index 24decb1b9b..f6fc3fa225 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'spree/core/gateway_error'
 
 describe Spree::Admin::PaymentsController, type: :controller do
   include StripeHelper
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
index f42cffe222..2f327e2de2 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'spree/core/gateway_error'
 
 describe Spree::Admin::PaymentsController, type: :controller do
   let!(:shop) { create(:enterprise) }
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 410fc588ed..17c0d6e18f 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'spree/core/gateway_error'
 
 describe Spree::Order do
   include OpenFoodNetwork::EmailHelper
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index f1f76a7990..4f40a43d6e 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'spree/core/gateway_error'
 
 describe Spree::Payment do
   context 'original specs from Spree' do