diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index 071e463979..bf6453269b 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -417,7 +417,7 @@ describe Spree::OrdersController, type: :controller do
       end
 
       context "when the order is complete" do
-        let(:order) { create(:completed_order_with_totals, user: user) }
+        let(:order) { create(:completed_order_with_totals, user: user, distributor: create(:distributor_enterprise)) }
 
         before do
           setup_email
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index ce3a4acea1..03036f17b7 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -489,7 +489,7 @@ describe Spree::Order do
       end
 
       it "finds only orders not in specified state" do
-        o = FactoryBot.create(:completed_order_with_totals)
+        o = FactoryBot.create(:completed_order_with_totals, distributor: create(:distributor_enterprise))
         o.cancel!
         Spree::Order.not_state(:canceled).should_not include o
       end