diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
index 632ba194cf8de..fbb9dda50f0d9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -70,6 +70,8 @@
         <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
         <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
 
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
         <!--See related product in storefront-->
         <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
index 0487668c10094..6c6cc9185380b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
@@ -44,8 +44,7 @@
             </actionGroup>
             <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
 
-            <!-- Run reindex -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <deleteData createDataKey="createBundleProductCreateBundleProduct" stepKey="deleteDynamicBundleProduct"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index dc8cb24246567..613187a4c3856 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -22,6 +22,8 @@
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Delete the bundled product -->
@@ -89,6 +91,10 @@
 
         <!-- Save product and go to storefront -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+
+        <wait stepKey="waitBeforeIndexerAfterBundle" time="60"/>
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexerAfterBundle"/>
+
         <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
         <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 9dbd6e26bddc4..3a40a1b7eeb71 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -65,6 +65,8 @@
         <click stepKey="saveProductBundle" selector="{{AdminProductFormActionSection.saveButton}}"/>
         <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
 
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
         <!-- Go to the storefront bundled product page -->
         <amOnPage url="/{{BundleProduct.urlKey}}.html" stepKey="visitStoreFrontBundle"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index bc04b3b1dcd0b..5174620764271 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -9,13 +9,13 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultProduct" type="product">
+        <data key="name" unique="suffix">testProductName</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">testProductName</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <data key="weight">1</data>
@@ -23,13 +23,13 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="ApiSimpleProduct" type="product">
+        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -55,15 +55,15 @@
         <data key="urlKey" unique="suffix">api-simple-product</data>
     </entity>
     <entity name="SimpleProduct" type="product">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="urlKey" unique="suffix">simpleproduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">1000</data>
-        <data key="urlKey" unique="suffix">simpleproduct</data>
         <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
@@ -72,10 +72,10 @@
         <data key="name">SimpleProduct -+~/\\&lt;&gt;\’“:*\$#@()!,.?`=%&amp;^</data>
     </entity>
     <entity name="SimpleProductBeforeUpdate" type="product">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku">simpleProduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -86,10 +86,10 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProductAfterImport1" type="product">
+        <data key="name">SimpleProductAfterImport1</data>
         <data key="sku">SimpleProductForTest1</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name">SimpleProductAfterImport1</data>
         <data key="price">250.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -100,49 +100,50 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProductAfterImport2" type="product">
+        <data key="name">SimpleProductAfterImport2</data>
         <data key="sku">SimpleProductForTest2</data>
+        <data key="urlKey">simple-product-for-test-2</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name">SimpleProductAfterImport2</data>
         <data key="price">300.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
-        <data key="urlKey">simple-product-for-test-2</data>
         <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProductAfterImport3" type="product">
+        <data key="name">SimpleProductAfterImport3</data>
         <data key="sku">SimpleProductForTest3</data>
+        <data key="urlKey">simple-product-for-test-3</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name">SimpleProductAfterImport3</data>
         <data key="price">350.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
-        <data key="urlKey">simple-product-for-test-3</data>
         <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProduct2" type="product">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleProduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">1000</data>
+        <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
     <entity name="SimpleProduct3" type="product">
+        <data key="name" unique="suffix">simple</data>
         <data key="sku" unique="suffix">simple</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">simple</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -152,59 +153,59 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProduct4" type="product">
+        <data key="name" unique="suffix">OutOfStockProduct</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">OutOfStockProduct</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">0</data>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleOutOfStockProduct" type="product">
+        <data key="name" unique="suffix">OutOfStockProduct</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">OutOfStockProduct</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">0</data>
     </entity>
     <entity name="SimpleProductInStockQuantityZero" type="product">
+        <data key="name" unique="suffix">SimpleProductInStockQuantityZero</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">SimpleProductInStockQuantityZero</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">SimpleProductInStockQuantityZero</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">SimpleProductInStockQuantityZero</data>
         <data key="status">1</data>
         <data key="quantity">0</data>
         <requiredEntity type="product_extension_attribute">EavStock0</requiredEntity>
     </entity>
     <!-- Simple Product Disabled -->
     <entity name="SimpleProductOffline" type="product2">
+        <data key="name" unique="suffix">SimpleOffline</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">SimpleOffline</data>
         <data key="price">123.00</data>
         <data key="status">2</data>
         <data key="quantity">100</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="SimpleProductDisabled" type="product">
+        <data key="name" unique="suffix">Simple Product Disabled</data>
         <data key="sku" unique="suffix">simple_product_disabled</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">Simple Product Disabled</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">2</data>
@@ -212,10 +213,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
     <entity name="SimpleProductNotVisibleIndividually" type="product">
+        <data key="name" unique="suffix">Simple Product Not Visible Individually</data>
         <data key="sku" unique="suffix">simple_product_not_visible_individually</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">Simple Product Not Visible Individually</data>
         <data key="price">123.00</data>
         <data key="visibility">1</data>
         <data key="status">1</data>
@@ -226,10 +227,10 @@
         <data key="price">321.00</data>
     </entity>
     <entity name="SimpleOne" type="product2">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleOne</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">1.23</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -237,25 +238,25 @@
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="ApiSimpleOutOfStock" type="product2">
+        <data key="name" unique="suffix">Api Simple Out Of Stock Product</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Out Of Stock Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="ApiSimpleOne" type="product2">
+        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -265,26 +266,26 @@
         <data key="sku" unique="suffix">pr</data>
     </entity>
     <entity name="ApiSimpleOneHidden" type="product2">
+        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">1</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="ApiSimpleTwo" type="product2">
+        <data key="name" unique="suffix">Api Simple Product Two</data>
         <data key="sku" unique="suffix">api-simple-product-two</data>
+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product Two</data>
         <data key="price">234.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -300,23 +301,23 @@
         <data key="price">70</data>
     </entity>
     <entity name="ApiSimpleTwoHidden" type="product2">
+        <data key="name" unique="suffix">Api Simple Product Two</data>
         <data key="sku" unique="suffix">api-simple-product-two</data>
+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">1</data>
-        <data key="name" unique="suffix">Api Simple Product Two</data>
         <data key="price">234.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="VirtualProduct" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
         <data key="sku" unique="suffix">virtualproduct</data>
         <data key="type_id">virtual</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">VirtualProduct</data>
         <data key="price">99.99</data>
         <data key="quantity">250</data>
         <data key="weight">0</data>
@@ -324,10 +325,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
     <entity name="SimpleTwo" type="product2">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleTwo</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">1.23</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -378,52 +379,52 @@
         <data key="filename">test_image</data>
     </entity>
     <entity name="ProductWithUnicode" type="product">
+        <data key="name" unique="suffix">&#38657;&#20135;&#21697;</data>
         <data key="sku" unique="suffix">&#38657;&#20135;&#21697;</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">&#38657;&#20135;&#21697;</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="productWithHTMLEntityOne" type="product">
+        <data key="name" unique="suffix">SimpleOne&#8482;Product</data>
         <data key="sku" unique="suffix">SimpleOne&#8482;Product</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">SimpleOne&#8482;Product</data>
         <data key="price">50.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="productWithHTMLEntityTwo" type="product">
+        <data key="name" unique="suffix">SimpleTwo&#38657;&#20135;&#21697;&lt;カネボウPro</data>
         <data key="sku" unique="suffix">SimpleTwo&#38657;&#20135;&#21697;&lt;カネボウPro</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">SimpleTwo&#38657;&#20135;&#21697;&lt;カネボウPro</data>
         <data key="price">50.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="defaultVirtualProduct" type="product">
+        <data key="name" unique="suffix">virtualProduct</data>
         <data key="sku" unique="suffix">virtualProduct</data>
+        <data key="urlKey" unique="suffix">virtualproduct</data>
         <data key="type_id">virtual</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">virtualProduct</data>
         <data key="price">12.34</data>
-        <data key="urlKey" unique="suffix">virtualproduct</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <data key="weight">0</data>
@@ -431,13 +432,13 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="productWithDescription" type="product">
+        <data key="name" unique="suffix">testProductWithDescriptionName</data>
         <data key="sku" unique="suffix">testProductWithDescriptionSku</data>
+        <data key="urlKey" unique="suffix">testproductwithdescriptionurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">testProductWithDescriptionName</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testproductwithdescriptionurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -446,13 +447,13 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiProductWithDescription" type="product">
+        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -460,13 +461,13 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiProductNameWithNoSpaces" type="product">
+        <data key="name" unique="suffix">ApiSimpleProduct</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">ApiSimpleProduct</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -474,13 +475,13 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiProductWithDescriptionAndUnderscoredSku" type="product">
+        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="sku" unique="suffix">api_simple_product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -488,26 +489,26 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="_newDefaultProduct" type="product">
+        <data key="name" unique="suffix">testproductname</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">testproductname</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProductWithCustomAttributeSet" type="product">
+        <data key="name" unique="suffix">testProductName</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <var key="attribute_set_id" entityKey="attribute_set_id" entityType="CatalogAttributeSet"/>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">testProductName</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="weight">1</data>
         <data key="quantity">100</data>
@@ -572,13 +573,13 @@
         <requiredEntity type="product_option">ProductOptionFile</requiredEntity>
     </entity>
     <entity name="ApiVirtualProductWithDescription" type="product">
+        <data key="name" unique="suffix">Api Virtual Product</data>
         <data key="sku" unique="suffix">api-virtual-product</data>
+        <data key="urlKey" unique="suffix">api-virtual-product</data>
         <data key="type_id">virtual</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Virtual Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-virtual-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -586,13 +587,13 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiVirtualProductWithDescriptionAndUnderscoredSku" type="product">
+        <data key="name" unique="suffix">Api Virtual Product</data>
         <data key="sku" unique="suffix">api_virtual_product</data>
+        <data key="urlKey" unique="suffix">api-virtual-product</data>
         <data key="type_id">virtual</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Virtual Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-virtual-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -600,15 +601,15 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="SimpleProductWithNewFromDate" type="product">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="urlKey" unique="suffix">simpleproduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">125.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">1000</data>
-        <data key="urlKey" unique="suffix">simpleproduct</data>
         <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">ApiProductNewsFromDate</requiredEntity>
@@ -635,7 +636,7 @@
         <var key="sku" entityKey="sku" entityType="product3"/>
     </entity>
     <entity name="ApiSimplePrice1" type="product">
-        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="sku" unique="suffix">apisimpleproduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
@@ -643,7 +644,7 @@
         <data key="price">1.00</data>
     </entity>
     <entity name="ApiSimplePrice100" type="product">
-        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="sku" unique="suffix">apisimpleproduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
index 0c0b8751a732e..84eb3a843aa1f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -27,6 +27,8 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct4"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct5"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct6"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Delete simple product -->
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/OpenCatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/OpenCatalogPriceRuleActionGroup.xml
index c810d9579df92..68ce445d991b3 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/OpenCatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/OpenCatalogPriceRuleActionGroup.xml
@@ -13,6 +13,7 @@
             <argument name="ruleName" type="string" defaultValue="CustomCatalogRule.name"/>
         </arguments>
         <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogPriceRuleGridPageLoad"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
         <fillField selector="{{AdminCatalogPriceRuleGridSection.filterByRuleName}}" userInput="{{ruleName}}" stepKey="filterByRuleName"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index ae7b8d2446380..e335caa2ddb64 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -21,6 +21,8 @@
         <before>
             <!--Create a product-->
             <createData entity="SimpleProduct2" stepKey="createProduct"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!--Delete created data-->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
index 3edb7c0f17ab9..87b181616bd7a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
@@ -23,12 +23,12 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="ApiConfigurableProduct" type="product">
+        <data key="name" unique="suffix">API Configurable Product</data>
         <data key="sku" unique="suffix">api-configurable-product</data>
+        <data key="urlKey" unique="suffix">api-configurable-product</data>
         <data key="type_id">configurable</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">API Configurable Product</data>
-        <data key="urlKey" unique="suffix">api-configurable-product</data>
         <data key="price">123.00</data>
         <data key="weight">2</data>
         <data key="status">1</data>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
index bba8232139d69..924707a16600f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
@@ -21,6 +21,8 @@
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Delete configurable product -->
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
index 4260417b46fd0..3cb37a248aa30 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -17,6 +17,7 @@
         </arguments>
 
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="waitForCreateAccountLink"/>
         <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
         <fillField  stepKey="fillFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
         <fillField  stepKey="fillLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
index fb5983bb58b6d..3651b322628c4 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
@@ -88,6 +88,8 @@
         <!-- Save product -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
+        <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
+
         <!-- Go to storefront category page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
index a09076b7dc06e..27d505e070f5b 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
@@ -34,6 +34,8 @@
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
 
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
         <!--See related product in storefront-->
         <amOnPage url="{{DownloadableProduct.sku}}.html" stepKey="goToStorefront"/>
     </test>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
index fdffd286d632f..a0698224b780c 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
@@ -34,6 +34,8 @@
             <argument name="product" value="GroupedProduct"/>
         </actionGroup>
 
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
         <!--See related product in storefront-->
         <amOnPage url="{{GroupedProduct.sku}}.html" stepKey="goToStorefront"/>
     </test>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml
index a69cd8688c6c5..c4e70a1cacd1c 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml
@@ -13,7 +13,7 @@
         <waitForPageLoad stepKey="waitForLoadingCreditMemoPage" after="pushButtonCreditMemo"/>
         <scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollToBottom" after="waitForLoadingCreditMemoPage"/>
         <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickSubmitRefund" after="scrollToBottom"/>
-        <waitForPageLoad stepKey="waitForMainOrderPageLoad" after="clickSubmitRefund"/>
+        <waitForPageLoad stepKey="waitForMainOrderPageLoad" after="clickSubmitRefund" time="60"/>
         <see userInput="You created the credit memo." stepKey="seeCreditMemoMessage" after="waitForMainOrderPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
index 45fdfebfa8145..ecdf9e34de55a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
@@ -11,6 +11,7 @@
     <section name="AdminOrderDetailsMainActionsSection">
         <element name="back" type="button" selector="#back" timeout="30"/>
         <element name="cancel" type="button" selector="#order-view-cancel-button" timeout="30"/>
+        <element name="orderEntityId" type="input" selector="#sales_order_view input[name='order_id']" timeout="30"/>
         <element name="sendEmail" type="button" selector="#send_notification" timeout="30"/>
         <element name="creditMemo" type="button" selector="#order_creditmemo" timeout="30"/>
         <element name="hold" type="button" selector="#order-view-hold-button" timeout="30"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
index 6db1c4f96796f..ab8149978996e 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
@@ -74,6 +74,9 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct2"/>
             </createData>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
 
diff --git a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
index 597abb5694e30..4ccda7ae7f2b1 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="AdminShipmentNewPage" url="order_shipment/new/order_id/" area="admin" module="Shipping">
+    <page name="AdminShipmentNewPage" url="admin/order_shipment/new/order_id/" area="admin" module="Shipping">
         <section name="AdminShipmentMainActionsSection"/>
         <section name="AdminShipmentOrderInformationSection"/>
         <section name="AdminShipmentAddressInformationSection"/>
@@ -16,4 +16,4 @@
         <section name="AdminShipmentItemsSection"/>
         <section name="AdminShipmentTotalSection"/>
     </page>
-</pages>
\ No newline at end of file
+</pages>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index f0fac38a6c05c..e7bf7702328c0 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -41,6 +41,7 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
             <!-- Fill out form for a new user with address -->
             <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
@@ -275,6 +276,8 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -385,6 +388,8 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
index e0e411a04d484..050ab3889984b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
@@ -41,6 +41,8 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -146,14 +148,7 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
-            <!-- Fill out form for a new user with address -->
-            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-                <argument name="Customer" value="Simple_US_Customer_NY"/>
-            </actionGroup>
-
-            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-                <argument name="Address" value="US_Address_NY"/>
-            </actionGroup>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -186,6 +181,15 @@
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
         </after>
 
+        <!-- Fill out form for a new user with address -->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="Simple_US_Customer_NY"/>
+        </actionGroup>
+
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+
         <!-- Go to the created product page and add it to the cart -->
         <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
         <waitForPageLoad stepKey="waitForSimpleProductPage"/>
@@ -265,6 +269,8 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -381,14 +387,7 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
-            <!-- Fill out form for a new user with address -->
-            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-                <argument name="Customer" value="Simple_US_Customer_NY"/>
-            </actionGroup>
-
-            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-                <argument name="Address" value="US_Address_NY"/>
-            </actionGroup>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -421,6 +420,15 @@
             <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
         </after>
 
+        <!-- Fill out form for a new user with address -->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="Simple_US_Customer_NY"/>
+        </actionGroup>
+
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+
         <!-- Go to the created product page and add it to the cart -->
         <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
         <waitForPageLoad stepKey="waitForVirtualProductPage"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
index 3a823efbcdf61..9fffa51e7d3c7 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
@@ -52,8 +52,8 @@
             <scrollTo selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="scrollToBundleSection"/>
             <selectOption userInput="Separately" selector="{{AdminProductFormBundleSection.shipmentType}}" stepKey="selectSeparately"/>
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <!-- Delete data -->
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
index 2d83043f81318..f942a8f314a67 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
@@ -43,8 +43,8 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <!-- Delete data -->
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
index dc02e2424b827..83ab138dacf55 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
@@ -11,7 +11,7 @@
             <field name="payment_code" xsi:type="string">braintree</field>
             <field name="cc_number" xsi:type="string">4000000000000002</field>
             <field name="cc_exp_month" xsi:type="string">01</field>
-            <field name="cc_exp_year" xsi:type="string">20</field>
+            <field name="cc_exp_year" xsi:type="string">24</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
@@ -19,7 +19,7 @@
             <field name="payment_code" xsi:type="string">braintree</field>
             <field name="cc_number" xsi:type="string">4000000000000028</field>
             <field name="cc_exp_month" xsi:type="string">01</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
@@ -27,7 +27,7 @@
             <field name="payment_code" xsi:type="string">braintree</field>
             <field name="cc_number" xsi:type="string">4000111111111511</field>
             <field name="cc_exp_month" xsi:type="string">01</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
@@ -35,7 +35,7 @@
             <field name="payment_code" xsi:type="string">braintree</field>
             <field name="cc_number" xsi:type="string">4111111111111111</field>
             <field name="cc_exp_month" xsi:type="string">01 - January</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
         </dataset>
     </repository>
 </config>