diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 141472786d..350fe40cc6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -92,9 +92,8 @@
     reset_spree_preferences
 
     country = create(:country, name: 'United States of America', iso_name: 'UNITED STATES', iso: 'US', states_required: true)
-    Spree::Config[:default_country_id] = country.id
 
-    create(:store, default: true)
+    create(:store, default_country: country, default: true)
   end
 
   config.after(:each, type: :feature) do |example|