diff --git a/spec/system/consumer/shopping/variant_overrides_spec.rb b/spec/system/consumer/shopping/variant_overrides_spec.rb
index cda13c4459..01dd56c349 100644
--- a/spec/system/consumer/shopping/variant_overrides_spec.rb
+++ b/spec/system/consumer/shopping/variant_overrides_spec.rb
@@ -18,21 +18,33 @@ RSpec.describe "shopping with variant overrides defined" do
   let(:outgoing_exchange) { oc.exchanges.outgoing.first }
   let(:sm) { hub.shipping_methods.first }
   let(:pm) { hub.payment_methods.first }
-  let(:product1) { create(:simple_product, supplier: producer) }
-  let(:product2) { create(:simple_product, supplier: producer) }
-  let(:product3) { create(:simple_product, supplier: producer, on_demand: true) }
-  let(:product4) { create(:simple_product, supplier: producer) }
-  let(:product1_variant1) { create(:variant, product: product1, price: 11.11, unit_value: 1) }
-  let(:product1_variant2) { create(:variant, product: product1, price: 22.22, unit_value: 2) }
-  let(:product2_variant1) { create(:variant, product: product2, price: 33.33, unit_value: 3) }
-  let(:product1_variant3) { create(:variant, product: product1, price: 44.44, unit_value: 4) }
+  let(:product1) { create(:simple_product, supplier_id: producer.id) }
+  let(:product2) { create(:simple_product, supplier_id: producer.id) }
+  let(:product3) { create(:simple_product, supplier_id: producer.id, on_demand: true) }
+  let(:product4) { create(:simple_product, supplier_id: producer.id) }
+  let(:product1_variant1) {
+    create(:variant, product: product1, price: 11.11, unit_value: 1, supplier: producer)
+  }
+  let(:product1_variant2) {
+    create(:variant, product: product1, price: 22.22, unit_value: 2, supplier: producer)
+  }
+  let(:product2_variant1) {
+    create(:variant, product: product2, price: 33.33, unit_value: 3, supplier: producer)
+  }
+  let(:product1_variant3) {
+    create(:variant, product: product1, price: 44.44, unit_value: 4, supplier: producer)
+  }
   let(:product3_variant1) {
-    create(:variant, product: product3, price: 55.55, unit_value: 5, on_demand: true)
+    create(:variant, product: product3, price: 55.55, unit_value: 5, on_demand: true,
+                     supplier: producer)
   }
   let(:product3_variant2) {
-    create(:variant, product: product3, price: 66.66, unit_value: 6, on_demand: true)
+    create(:variant, product: product3, price: 66.66, unit_value: 6, on_demand: true,
+                     supplier: producer)
+  }
+  let(:product4_variant1) {
+    create(:variant, product: product4, price: 77.77, unit_value: 7, supplier: producer)
   }
-  let(:product4_variant1) { create(:variant, product: product4, price: 77.77, unit_value: 7) }
   let!(:product1_variant1_override) {
     create(:variant_override, :use_producer_stock_settings, hub:, variant: product1_variant1,
                                                             price: 55.55, count_on_hand: nil,