diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
index fc54b3ca5b656eeeddeba3789014a44074d521fb..cae85fea49c4579d701229e1153e4ad4f912816c 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
@@ -124,9 +124,7 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
 
         $this->assertBillingAddressAbsentInPayment->processAssert($this->checkoutOnepage);
 
-        if ($this->checkoutMethod === 'guest' &&
-            empty($this->shipping['shipping_method']) &&
-            empty($this->shipping['shipping_service'])) {
+        if ($this->checkoutMethod === 'guest' && empty($this->shipping)) {
             $this->checkoutOnepage->getLoginBlock()->fillGuestFields($this->customer);
         }