diff --git a/spec/support/request/checkout_helper.rb b/spec/support/request/checkout_helper.rb
index d08cae5ceb..e27ffd27ed 100644
--- a/spec/support/request/checkout_helper.rb
+++ b/spec/support/request/checkout_helper.rb
@@ -49,9 +49,9 @@ module CheckoutHelper
 
     fill_out_billing_address
 
-    if save_default_addresses
-      check "Shipping address same as billing address?"
-      check "Save as default shipping address"
-    end
+    return unless save_default_addresses
+
+    check "Shipping address same as billing address?"
+    check "Save as default shipping address"
   end
 end