diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
index 37c4d34065707e922b34b91850db785f04b4e2cb..c5799d3fcaa0849290c392e5c356c2854501adc7 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
@@ -100,10 +100,9 @@ class View extends Block
      */
     protected function giftMessageButtonIsVisible($itemName)
     {
-        $isVisible = $this->_rootElement->find(
+        return $isVisible = $this->_rootElement->find(
             sprintf($this->giftMessageButtonSelector, $itemName),
             Locator::SELECTOR_XPATH
         )->isVisible();
-        return $isVisible;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
index 7bc4a02cc004dd50d22de0a8f5389100b18b6afb..932115cdf37abb0a769342973706c00a20f05734 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
@@ -62,7 +62,7 @@ class AssertGiftMessageInFrontendOrderItems extends AbstractConstraint
                     'message' => $itemGiftMessage->getMessage(),
                 ];
             }
-            if ($product->getIsVirtual() == 'Yes'){
+            if ($product->getIsVirtual() == 'Yes') {
                 $expectedData = [];
             }