diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml
index 49edf529a188d..4f6b7e31a9c5b 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml
@@ -31,13 +31,13 @@
         <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
 
-    <actionGroup name="FindAndAddProductToCardActionGroup">
+    <actionGroup name="FindAndAddProductToCardActGr">
         <click selector="{{StorefrontAddProductToCartSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
         <click selector="{{StorefrontAddProductToCartSection.showCard}}" stepKey="clickToOpenCard"/>
-        <waitForPageLoad stepKey="WaitForFormOpened" time="3"/>
+        <waitForPageLoad stepKey="WaitForFormOpened"/>
         <click selector="{{StorefrontAddProductToCartSection.proceed}}" stepKey="clickToProceedToCheckout"/>
-        <waitForPageLoad time="5" stepKey="waitForTheFormIsOpened"/>
+        <waitForPageLoad stepKey="waitForTheFormIsOpened"/>
         <see userInput="Shipping Address" stepKey="seeShippingAddress"/>
     </actionGroup>
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
index b8abda3b37de6..1359893ec090e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
@@ -25,7 +25,7 @@
         </before>
 
          <!--Navigate to a category page -->
-        <amOnPage url="/{{SimpleProductOne.name}}.html" stepKey="GoToProductPage"/>
+        <amOnPage url="/{{SimpleProductOne.urlKey}}.html" stepKey="GoToProductPage"/>
 
         <waitForPageLoad stepKey="waitForPageLoad"/>
 
@@ -36,7 +36,7 @@
                             delete_cookie('form_key');" stepKey="removeCookies" after="waitForPageLoad"/>
 
         <!-- "Add to Cart" any product-->
-        <actionGroup ref="FindAndAddProductToCardActionGroup" stepKey="addProductToCard"/>
+        <actionGroup ref="FindAndAddProductToCardActGr" stepKey="addProductToCard"/>
 
         <after>
             <!--Delete created product-->