diff --git a/spec/factories.rb b/spec/factories.rb
index 455fc9b9a4..9862ef9fc2 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -178,11 +178,6 @@ FactoryBot.define do
 end
 
 FactoryBot.modify do
-  factory :address do
-    state { Spree::State.find_by name: 'Victoria' }
-    country { Spree::Country.find_by name: 'Australia' || Spree::Country.first }
-  end
-
   factory :credit_card do
     cc_type 'visa'
   end
diff --git a/spec/factories/address_factory.rb b/spec/factories/address_factory.rb
index ec5f149d9c..cc8c790d7e 100644
--- a/spec/factories/address_factory.rb
+++ b/spec/factories/address_factory.rb
@@ -1,5 +1,14 @@
 FactoryBot.modify do
   factory :address do
+    state { Spree::State.find_by(name: 'Victoria') || Spree::State.first || create(:state) }
+    country do |address|
+      if address.state
+        address.state.country
+      else
+        Spree::Country.find_by(name: 'Australia') || Spree::Country.first || create(:country)
+      end
+    end
+
     trait :randomized do
       firstname { Faker::Name.first_name }
       lastname { Faker::Name.last_name }