diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index b2fbf2ae3810a..c28c5a040e553 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -38,15 +38,21 @@
             <deleteData createDataKey="product" stepKey="deleteProduct"/> 
             <deleteData createDataKey="category" stepKey="deleteCategory"/> 
         </after>
+        <comment userInput="Open product page | Comment is kept to preserve the step key for backward compatibility" stepKey="openProdPage"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToSimpleProductPage"/>
 
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront">
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="waitForSimpleProductPage">
             <argument name="productUrl" value="$$product.custom_attributes[url_key]$$"/>
         </actionGroup>
-        
+
+        <comment userInput="'Add to compare' link is not available | Comment is kept to preserve the step key for backward compatibility" stepKey="addToCompareLinkAvailability"/>
+
         <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="dontSeeAddToCompareLink"/>
       
+        <comment userInput="Turn on 'out of stock' config | Comment is kept to preserve the step key for backward compatibility" stepKey="onOutOfStockConfig"/>
         <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
   
+        <comment userInput="Clear cache and reindex | Comment is kept to preserve the step key for backward compatibility" stepKey="cleanCache"/>
         <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
            <argument name="indices" value=""/>
         </actionGroup>
@@ -54,41 +60,67 @@
            <argument name="tags" value=""/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront1">
+        <comment userInput="Open product page | Comment is kept to preserve the step key for backward compatibility" stepKey="openProductPage"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToSimpleProductPage2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSimpleProductPage2"/>
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="seeAddToCompareLink">
             <argument name="productUrl" value="$$product.custom_attributes[url_key]$$"/>
         </actionGroup>
+
+        <comment userInput="Click on 'Add to Compare' link | Comment is kept to preserve the step key for backward compatibility" stepKey="clickOnAddToCompareLink"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnAddToCompare"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProdAddToCmpList"/>
+        <comment userInput="Assert success message | Comment is kept to preserve the step key for backward compatibility" stepKey="assertSuccessMsg"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSuccessMessage"/>
        
-        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare1">
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="assertSuccessMessage">
             <argument name="productVar" value="$$product$$"/>
         </actionGroup>
 
-         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
+        <comment userInput="See product in the comparison list | Comment is kept to preserve the step key for backward compatibility" stepKey="seeProductInComparisonList"/>
+       
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="navigateToComparePage"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontProductComparePageLoad"/>
 
-        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInComparisonList">
+        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInCompareList">
           <argument name="productVar" value="$$product$$"/>
         </actionGroup>
     
-       <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage1">
+
+       <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="deleteProdFromCmpList"/>
+       <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="onCategoryPage"/>
+       <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="waitForPageLoad1">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearList"/>
+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clickClearAll"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForConfirmPageLoad"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="confirmProdDelate"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForConfirmLoad"/>
+        <comment userInput="Add product to compare list fom Category page | Comment is kept to preserve the step key for backward compatibility" stepKey="addToCmpFromCategPage"/>
 
-        <actionGroup ref="StorefrontHoverProductOnCategoryPageActionGroup" stepKey="hoverProduct"/>
+        <actionGroup ref="StorefrontHoverProductOnCategoryPageActionGroup" stepKey="hoverOverProduct"/>
 
-        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare2">
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="clickAddToCompare">
             <argument name="productVar" value="$$product$$"/>
         </actionGroup>
-    
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitProdAddingToCmpList"/>
+        <comment userInput="Assert success message | Comment is kept to preserve the step key for backward compatibility" stepKey="assertSuccessMsg2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSuccessMessage2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertSuccessMessage2"/>
+
+        <comment userInput="Check that product displays on add to compare widget | Comment is kept to preserve the step key for backward compatibility" stepKey="checkProdNameOnWidget"/> 
         <seeElement selector="{{StorefrontComparisonSidebarSection.ProductTitleByName($$product.name$$)}}" stepKey="seeProdNameOnCmpWidget"/>
 
-        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage1"/>
+        <comment userInput="See product in the compare page" stepKey="seeProductInComparePage"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="navigateToComparePage2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontProductComparePageLoad2"/>
        
-        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInComparisonList1">
+        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInCompareList2">
              <argument name="productVar" value="$$product$$"/>
         </actionGroup>