diff --git a/spec/support/features/fill_addresses_fields.rb b/spec/support/features/fill_addresses_fields.rb
index 9e521a0b..8beb82a7 100644
--- a/spec/support/features/fill_addresses_fields.rb
+++ b/spec/support/features/fill_addresses_fields.rb
@@ -8,7 +8,7 @@ def fill_addresses_fields_with(address)
       zipcode
       phone
     ]
-    fields += if Spree::Config.has_preference?(:use_combined_first_and_last_name_in_address) && Spree::Config.use_combined_first_and_last_name_in_address
+    fields += if SolidusSupport.combined_first_and_last_name_in_address?
       %w[name]
     else
       %w[firstname lastname]