diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest.xml
similarity index 98%
rename from app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
rename to app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest.xml
index c45a8aece5ffc..77dc83eec1176 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CreateAnAdminOrderUsingBraintreePaymentTest1">
+    <test name="CreateAnAdminOrderUsingBraintreePaymentTest1Test">
         <annotations>
             <features value="Backend"/>
             <stories value="Creation an admin order using Braintree payment"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscountTest.xml
similarity index 99%
rename from app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml
rename to app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscountTest.xml
index d2b0479f2bba6..5efa5fd0db6b6 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscountTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CreateAdminOrderPayedWithOnlinePaymentIncludingTaxAndDiscount">
+    <test name="CreateAdminOrderPayedWithOnlinePaymentIncludingTaxAndDiscountTest">
         <annotations>
             <features value="Braintree"/>
             <stories value="Get access to a New Credit Memo Page from Invoice for Order payed with online payment via Admin"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
similarity index 99%
rename from app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
index f272f3f98a8c9..a98d544aad3b6 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminDeleteABundleProduct">
+    <test name="AdminDeleteABundleProductTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="Admin list bundle products"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
similarity index 98%
rename from app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
index 5aa72fb651985..dea39fcb45908 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminFilterProductListByBundleProduct">
+    <test name="AdminFilterProductListByBundleProductTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="Admin list bundle products"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
similarity index 99%
rename from app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
index 364d4fa68e590..62a66b7d092ef 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontBundleProductShownInCategoryListAndGrid">
+    <test name="StorefrontBundleProductShownInCategoryListAndGridTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="Bundle products list on Storefront"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPricesTest.xml
similarity index 99%
rename from app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPricesTest.xml
index 4bb54436e8729..0c9be915a7a8b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPricesTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCheckBundleProductOptionTierPrices">
+    <test name="StorefrontCheckBundleProductOptionTierPricesTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="View bundle products"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
index 7ced26bab2c96..f0e16bbdd1b99 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontGoToDetailsPageWhenAddingToCart">
+    <test name="StorefrontGoToDetailsPageWhenAddingToCartTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="Bundle products list on Storefront"/>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
index 977ee78c0d201..b1c3ed52f163b 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
@@ -65,7 +65,7 @@
         <scrollToTopOfPage stepKey="ScrollToTop"/>
         <click selector="{{CaptchaFormsDisplayingSection.captcha}}" stepKey="ClickToCloseCaptcha"/>
     </test>
-    <test name="CaptchaWithDisabledGuestCheckout">
+    <test name="CaptchaWithDisabledGuestCheckoutTest">
         <annotations>
             <features value="Captcha"/>
             <stories value="MC-5602 - CAPTCHA doesn't appear in login popup after refreshing page."/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.xml
similarity index 95%
rename from app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.xml
index cdb9a0a8b75d0..2e55d9fbfa4bc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.xml
@@ -7,7 +7,7 @@
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminChangeProductAttributeSet">
+    <test name="AdminChangeProductAttributeSetTest">
         <annotations>
             <features value="Checkout"/>
             <stories value="The required product attribute is not displayed when change attribute set"/>
@@ -49,7 +49,7 @@
             <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
 
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
-            <actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
similarity index 99%
rename from app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
index 2a4718223ef0c..9a580df52259b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
@@ -7,7 +7,7 @@
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCreateCategoryWithProductsGridFilter">
+    <test name="AdminCreateCategoryWithProductsGridFilterTest">
         <annotations>
             <stories value="Create categories"/>
             <title value="Apply category products grid filter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSetTest.xml
similarity index 98%
rename from app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSetTest.xml
index 7f6feaff3ed5d..2fbd1ac2cf321 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSetTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCreateProductCustomAttributeSet">
+    <test name="AdminCreateProductCustomAttributeSetTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Add/Update attribute set"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKey.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
similarity index 99%
rename from app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKey.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
index 400cc891b3c91..9babd94ef2641 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKey.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKey">
+    <test name="AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest">
         <annotations>
             <stories value="Product"/>
             <features value="Catalog"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml
index 09ddcd040bea4..bd1a5aaf9ed42 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminVerifyProductOrder">
+    <test name="AdminVerifyProductOrderTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Verify Product Order"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest.xml
similarity index 98%
rename from app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest.xml
index 07c2e8a972596..1615f75395fed 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontProductNameWithDoubleQuote">
+    <test name="StorefrontProductNameWithDoubleQuoteTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Create products"/>
@@ -66,7 +66,7 @@
         </actionGroup>
     </test>
 
-    <test name="StorefrontProductNameWithHTMLEntities">
+    <test name="StorefrontProductNameWithHTMLEntitiesTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Create product"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
similarity index 99%
rename from app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
index 36a803b03199b..b8aed7f0ac2ad 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle">
+    <test name="StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Custom options"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
index 8c10f22b7b09e..ae74a000d76e8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
@@ -47,7 +47,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
     </test>
-    <test name="Verifydefaultcontrolsonproductshortdescription">
+    <test name="VerifydefaultcontrolsonproductshortdescriptionTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Default toolbar configuration in Magento-MAGETWO-70412"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index dc715a5d95f2f..890df17f113d5 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="QuickSearchProductBySku">
+    <test name="QuickSearchProductBySkuTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find products"/>
@@ -41,7 +41,7 @@
             <argument name="productUrlKey" value="$createSimpleProduct.custom_attributes[url_key]$"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchProductByName" extends="QuickSearchProductBySku">
+    <test name="QuickSearchProductByNameTest" extends="QuickSearchProductBySkuTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find products via Name"/>
@@ -56,7 +56,7 @@
             <argument name="phrase" value="$createSimpleProduct.name$"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchProductByNameWithSpecialChars" extends="QuickSearchProductBySku">
+    <test name="QuickSearchProductByNameWithSpecialCharsTest" extends="QuickSearchProductBySkuTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="Quick Search can find products with names that contain special characters"/>
@@ -76,7 +76,7 @@
             <argument name="phrase" value="$createSimpleProduct.name$"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchEmptyResults">
+    <test name="QuickSearchEmptyResultsTest">
         <annotations>
             <features value="CatalogSearch"/>
             <stories value="Search Product on Storefront"/>
@@ -109,7 +109,7 @@
         <actionGroup ref="StorefrontCheckSearchIsEmptyActionGroup" stepKey="checkEmpty"/>
     </test>
 
-    <test name="QuickSearchWithTwoCharsEmptyResults" extends="QuickSearchEmptyResults">
+    <test name="QuickSearchWithTwoCharsEmptyResultsTest" extends="QuickSearchEmptyResultsTest">
         <annotations>
             <features value="CatalogSearch"/>
             <stories value="Search Product on Storefront"/>
@@ -143,7 +143,7 @@
         </actionGroup>
     </test>
 
-    <test name="QuickSearchProductByNameWithThreeLetters" extends="QuickSearchProductBySku">
+    <test name="QuickSearchProductByNameWithThreeLettersTest" extends="QuickSearchProductBySkuTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find products by their first three letters"/>
@@ -159,7 +159,7 @@
             <argument name="phrase" value="{$getFirstThreeLetters}"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchProductBy128CharQuery" extends="QuickSearchProductBySku">
+    <test name="QuickSearchProductBy128CharQueryTest" extends="QuickSearchProductBySkuTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search product with long names, using first 128 letters"/>
@@ -180,7 +180,7 @@
         </actionGroup>
     </test>
 
-    <test name="QuickSearchTwoProductsWithSameWeight">
+    <test name="QuickSearchTwoProductsWithSameWeightTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="Quick Search should sort products with the same weight appropriately"/>
@@ -263,7 +263,7 @@
             <argument name="index" value="1"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchTwoProductsWithDifferentWeight" extends="QuickSearchTwoProductsWithSameWeight">
+    <test name="QuickSearchTwoProductsWithDifferentWeightTest" extends="QuickSearchTwoProductsWithSameWeightTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="Quick Search should sort products with the different weight appropriately"/>
@@ -293,7 +293,7 @@
         </actionGroup>
     </test>
 
-    <test name="QuickSearchAndAddToCart">
+    <test name="QuickSearchAndAddToCartTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find a simple product and add it to cart"/>
@@ -325,7 +325,7 @@
             <argument name="productName" value="$createSimpleProduct.name$"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchAndAddToCartVirtual">
+    <test name="QuickSearchAndAddToCartVirtualTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find a virtual product and add it to cart"/>
@@ -357,7 +357,7 @@
             <argument name="productName" value="$createVirtualProduct.name$"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchAndAddToCartConfigurable">
+    <test name="QuickSearchAndAddToCartConfigurableTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find a configurable product and add it to cart"/>
@@ -401,7 +401,7 @@
             <argument name="optionName" value="{{colorProductAttribute1.name}}"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchAndAddToCartDownloadable">
+    <test name="QuickSearchAndAddToCartDownloadableTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find a downloadable product and add it to cart"/>
@@ -438,7 +438,7 @@
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchAndAddToCartGrouped">
+    <test name="QuickSearchAndAddToCartGroupedTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find a grouped product and add it to cart"/>
@@ -475,7 +475,7 @@
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchAndAddToCartBundleDynamic">
+    <test name="QuickSearchAndAddToCartBundleDynamicTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find a Bundle Dynamic product and add it to cart"/>
@@ -531,7 +531,7 @@
             <argument name="productName" value="$createBundleProduct.name$"/>
         </actionGroup>
     </test>
-    <test name="QuickSearchAndAddToCartBundleFixed">
+    <test name="QuickSearchAndAddToCartBundleFixedTest">
         <annotations>
             <stories value="Search Product on Storefront"/>
             <title value="User should be able to use Quick Search to find a Bundle Fixed product and add it to cart"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
index b939209751fcd..eb49f53921ea4 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CheckCheckoutSuccessPageAsRegisterCustomer">
+    <test name="CheckCheckoutSuccessPageAsRegisterCustomerTest">
         <annotations>
             <features value="Checkout"/>
             <stories value="Success page elements are presented for placed order as Customer"/>
@@ -131,7 +131,7 @@
         <seeElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="seeOrderTitleOnPrint"/>
         <switchToWindow stepKey="switchToWindow2"/>
     </test>
-    <test name="CheckCheckoutSuccessPageAsGuest">
+    <test name="CheckCheckoutSuccessPageAsGuestTest">
         <annotations>
             <features value="Checkout"/>
             <stories value="Success page elements are presented for placed order as Guest"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndCheckoutItemsCountTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndCheckoutItemsCountTest.xml
index c3f173961f0c5..8db1f8801ae1d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndCheckoutItemsCountTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndCheckoutItemsCountTest.xml
@@ -7,7 +7,7 @@
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCartItemsCountDisplayItemsQuantities">
+    <test name="StorefrontCartItemsCountDisplayItemsQuantitiesTest">
         <annotations>
             <stories value="Checkout order summary has wrong item count"/>
             <title value="Checkout order summary has wrong item count - display items quantities"/>
@@ -57,7 +57,7 @@
             <argument name="itemsText" value="3 Items in Cart"/>
         </actionGroup>
     </test>
-    <test name="StorefrontCartItemsCountDisplayUniqueItems" extends="StorefrontCartItemsCountDisplayItemsQuantities">
+    <test name="StorefrontCartItemsCountDisplayUniqueItemsTest" extends="StorefrontCartItemsCountDisplayItemsQuantitiesTest">
         <annotations>
             <stories value="Checkout order summary has wrong item count"/>
             <title value="Checkout order summary has wrong item count - display unique items"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
index 580b4e32b0b28..3a686c8efdd5f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -82,7 +82,7 @@
         <waitForElementVisible selector="{{AdminEditCustomerOrdersSection.orderGrid}}" stepKey="waitForOrdersGridVisible"/>
         <see selector="{{AdminEditCustomerOrdersSection.orderGrid}}" userInput="$$createCustomer.firstname$$ $$createCustomer.lastname$$" stepKey="verifyOrder"/>
     </test>
-    <test name="StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRates">
+    <test name="StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest">
         <annotations>
             <features value="Checkout"/>
             <stories value="Customer checkout"/>
@@ -198,7 +198,7 @@
         <waitForPageLoad stepKey="waitForOrderSuccessPage2"/>
         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" stepKey="seeSuccessMessage2"/>
     </test>
-    <test name="StorefrontCustomerCheckoutTestWithRestrictedCountriesForPayment">
+    <test name="StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest">
         <annotations>
             <features value="Checkout"/>
             <stories value="Checkout flow if payment solutions are not available"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
index cce4d9f0345d7..53d7904ffdc38 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
@@ -93,7 +93,7 @@
         <remove keyForRemoval="guestGoToCheckoutFromMinicart" />
         <actionGroup ref="GoToCheckoutFromCartActionGroup" stepKey="guestGoToCheckoutFromCart" after="seeCartQuantity" />
     </test>
-    <test name="StorefrontGuestCheckoutTestWithRestrictedCountriesForPayment">
+    <test name="StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest">
         <annotations>
             <features value="Checkout"/>
             <stories value="Checkout flow if payment solutions are not available"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
index cbf0072d44aed..778967c187f65 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectCheckout">
+    <test name="StorefrontVerifySecureURLRedirectCheckoutTest">
         <annotations>
             <features value="Checkout"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml b/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidationTest.xml
similarity index 98%
rename from app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidationTest.xml
index 6165def067ef4..38005682287e8 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidationTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StoreFrontMobileViewValidation">
+    <test name="StoreFrontMobileViewValidationTest">
         <annotations>
             <features value="Cms"/>
             <stories value="Mobile view page footer should stick to the bottom of page on Store front"/>
diff --git a/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml b/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
index 916a5a09a09c0..9700d8024ce8f 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="VerifyAllowDynamicMediaURLsSettingIsRemoved">
+    <test name="VerifyAllowDynamicMediaURLsSettingIsRemovedTest">
         <annotations>
             <features value="Backend"/>
             <stories value="Dynamic Media URL"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
index 2ab3a9e6e60c9..cfb85bd391f9f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
@@ -134,7 +134,7 @@
         <see stepKey="checkForOutOfStock3" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
     </test>
 
-    <test name="AdminConfigurableProductOutOfStockTestDeleteChildren">
+    <test name="AdminConfigurableProductOutOfStockTestDeleteChildrenTest">
         <annotations>
             <features value="ConfigurableProduct"/>
             <stories value="Product visibility when in stock/out of stock"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
index 24c60006a3504..0d74775f1e3ae 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="ProductsQtyReturnAfterOrderCancel">
+    <test name="ProductsQtyReturnAfterOrderCancelTest">
 
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml b/app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml
index 3ef941fa2e0ce..0c46ed4729d66 100644
--- a/app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml
+++ b/app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectContact">
+    <test name="StorefrontVerifySecureURLRedirectContactTest">
         <annotations>
             <features value="Contact"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProductTest.xml
similarity index 99%
rename from app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml
rename to app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProductTest.xml
index 18106836ce137..3e65c688e3474 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProductTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminProductBackRedirectNavigateFromCustomerViewCartProduct">
+    <test name="AdminProductBackRedirectNavigateFromCustomerViewCartProductTest">
         <annotations>
             <features value="Customer"/>
             <stories value="Product Back Button"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/ChangeCustomerGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/ChangeCustomerGroupTest.xml
index eb46a9d2b1ace..0eca9811f17f1 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/ChangeCustomerGroupTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/ChangeCustomerGroupTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="ChangingSingleCustomerGroupViaGrid">
+    <test name="ChangingSingleCustomerGroupViaGridTest">
         <annotations>
             <title value="DEPRECATED Change a single customer group via grid"/>
             <description value="From the selection of All Customers select a single customer to change their group"/>
@@ -61,7 +61,7 @@
         </actionGroup>
     </test>
 
-    <test name="ChangingAllCustomerGroupViaGrid" extends="ChangingSingleCustomerGroupViaGrid">
+    <test name="ChangingAllCustomerGroupViaGridTest" extends="ChangingSingleCustomerGroupViaGridTest">
         <annotations>
             <title value="DEPRECATED Change all customers' group via grid"/>
             <description value="Select All customers to change their group"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCustomerTest.xml
index da9dddf0539d3..f504af2334e10 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCustomerTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectCustomer">
+    <test name="StorefrontVerifySecureURLRedirectCustomerTest">
         <annotations>
             <features value="Customer"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceText.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceTest.xml
similarity index 96%
rename from app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceText.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceTest.xml
index ca4e560506ad0..131193e7743e2 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceText.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithTierPriceTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCreateDownloadableProductWithTierPriceText" extends="AdminCreateDownloadableProductWithGroupPriceTest">
+    <test name="AdminCreateDownloadableProductWithTierPriceTest" extends="AdminCreateDownloadableProductWithGroupPriceTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Create Downloadable Product"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml
index 6e039ca413a08..d7e0ce3b2ca22 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectDownloadable">
+    <test name="StorefrontVerifySecureURLRedirectDownloadableTest">
         <annotations>
             <features value="Downloadable"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
index 151a987ea89cc..7657c9a86a62b 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminGroupedProductsAreListedWhenOutOfStock">
+    <test name="AdminGroupedProductsAreListedWhenOutOfStockTest">
         <annotations>
             <features value="GroupedProduct"/>
             <stories value="MAGETWO-93181: Grouped product doesn't take care about his Linked Products when SalableQuantity &lt; ProductLink.ExtensionAttributes.Qty after Source Deduction"/>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml
similarity index 99%
rename from app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
rename to app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml
index 76a9cc8f920a1..0e0eb352c8d33 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="ShopByButtonInMobile">
+    <test name="ShopByButtonInMobileTest">
         <annotations>
             <features value="Layered Navigation"/>
             <stories value="Storefront Shop By collapsible button in mobile themes"/>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
index 085a710f2671c..e65747f4d63d0 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectMultishipping">
+    <test name="StorefrontVerifySecureURLRedirectMultishippingTest">
         <!--todo MC-5858: some urls don't redirect to https-->
         <annotations>
             <features value="Multishipping"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml
index 01b5e706fcefb..c38725f263525 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectNewsletter">
+    <test name="StorefrontVerifySecureURLRedirectNewsletterTest">
         <annotations>
             <features value="Newsletter"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest.xml
similarity index 97%
rename from app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
rename to app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest.xml
index 3e1a825861b5e..db5fb3848dcf1 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest">
         <annotations>
             <features value="PayPal"/>
             <stories value="Payment methods"/>
@@ -73,7 +73,7 @@
             <argument name="countryCode" value="gb"/>
         </actionGroup>
     </test>
-    <test name="AdminConfigPaymentsConflictResolutionForPayPalInJapan" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInJapanTest" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest">
         <annotations>
             <features value="PayPal"/>
             <stories value="Payment methods"/>
@@ -113,7 +113,7 @@
             <argument name="countryCode" value="jp"/>
         </actionGroup>
     </test>
-    <test name="AdminConfigPaymentsConflictResolutionForPayPalInFrance" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInFranceTest" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest">
         <annotations>
             <features value="PayPal"/>
             <stories value="Payment methods"/>
@@ -153,7 +153,7 @@
             <argument name="countryCode" value="fr"/>
         </actionGroup>
     </test>
-    <test name="AdminConfigPaymentsConflictResolutionForPayPalInHongKong" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInHongKongTest" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest">
         <annotations>
             <features value="PayPal"/>
             <stories value="Payment methods"/>
@@ -193,7 +193,7 @@
             <argument name="countryCode" value="hk"/>
         </actionGroup>
     </test>
-    <test name="AdminConfigPaymentsConflictResolutionForPayPalInItaly" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInItalyTest" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest">
         <annotations>
             <features value="PayPal"/>
             <stories value="Payment methods"/>
@@ -233,7 +233,7 @@
             <argument name="countryCode" value="it"/>
         </actionGroup>
     </test>
-    <test name="AdminConfigPaymentsConflictResolutionForPayPalInSpain" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInSpainTest" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest">
         <annotations>
             <features value="PayPal"/>
             <stories value="Payment methods"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionStateTest.xml
similarity index 95%
rename from app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
rename to app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionStateTest.xml
index ba5e701ceea66..62d77d8aae6f8 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionStateTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminConfigPaymentsSectionState">
+    <test name="AdminConfigPaymentsSectionStateTest">
         <annotations>
             <features value="PayPal"/>
             <stories value="Payment methods"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontVerifySecureURLRedirectPaypalTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontVerifySecureURLRedirectPaypalTest.xml
index b2fcfa43181dc..cf0e4b3d0b370 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontVerifySecureURLRedirectPaypalTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontVerifySecureURLRedirectPaypalTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectPaypal">
+    <test name="StorefrontVerifySecureURLRedirectPaypalTest">
         <annotations>
             <features value="Paypal"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifySecureURLRedirectReviewTest.xml b/app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifySecureURLRedirectReviewTest.xml
index b10af7a303cc7..8a2f441e5c4e8 100644
--- a/app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifySecureURLRedirectReviewTest.xml
+++ b/app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifySecureURLRedirectReviewTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectReview">
+    <test name="StorefrontVerifySecureURLRedirectReviewTest">
         <annotations>
             <features value="Review"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrderTest.xml
similarity index 96%
rename from app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml
rename to app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrderTest.xml
index cabb6edec2f52..c8b2b66a758eb 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrderTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminChangeCustomerGroupInNewOrder">
+    <test name="AdminChangeCustomerGroupInNewOrderTest">
         <annotations>
             <title value="Customer account group cannot be selected while creating a new customer in order"/>
             <stories value="MC-15290: Customer account group cannot be selected while creating a new customer in order"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml
similarity index 98%
rename from app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
rename to app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml
index ad3a411d92414..ceb8c5f9b1aa2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontRedirectToOrderHistory">
+    <test name="StorefrontRedirectToOrderHistoryTest">
         <annotations>
             <features value="Redirection Rules"/>
             <stories value="Create Invoice"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifySecureURLRedirectSalesTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifySecureURLRedirectSalesTest.xml
index 505493e4e5682..d49ea4cfcbec7 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifySecureURLRedirectSalesTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifySecureURLRedirectSalesTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectSales">
+    <test name="StorefrontVerifySecureURLRedirectSalesTest">
         <annotations>
             <features value="Sales"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountryTest.xml
similarity index 99%
rename from app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountryTest.xml
index 832b9ef8bd4b4..1406d4dfbde67 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountryTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCartPriceRuleCountry">
+    <test name="StorefrontCartPriceRuleCountryTest">
         <annotations>
             <features value="SalesRule"/>
             <stories value="Create cart price rule"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml
similarity index 99%
rename from app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml
index 9882b04bdc956..aade41b30284c 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCartPriceRulePostcode">
+    <test name="StorefrontCartPriceRulePostcodeTest">
         <annotations>
             <features value="SalesRule"/>
             <stories value="Create cart price rule"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantityTest.xml
similarity index 95%
rename from app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantityTest.xml
index 08a7bd72cd18d..283d22351b1f1 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantityTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCartPriceRuleQuantity">
+    <test name="StorefrontCartPriceRuleQuantityTest">
         <annotations>
             <features value="SalesRule"/>
             <stories value="Create cart price rule"/>
@@ -24,7 +24,7 @@
             <createData entity="_defaultProduct" stepKey="createPreReqProduct">
                 <requiredEntity createDataKey="createPreReqCategory"/>
             </createData>
-            <actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
 
@@ -62,8 +62,8 @@
         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="1.00" stepKey="fillDiscountAmount"/>
         <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
         <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
-        <actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
-          
+        <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+
         <!-- Add 1 product to the cart -->
         <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleStateTest.xml
similarity index 99%
rename from app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleStateTest.xml
index 19ffb7c36f992..fafede4120573 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleStateTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCartPriceRuleState">
+    <test name="StorefrontCartPriceRuleStateTest">
         <annotations>
             <features value="SalesRule"/>
             <stories value="Create cart price rule"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotalTest.xml
similarity index 97%
rename from app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotalTest.xml
index 94e53cfc88047..a32d42e26d15f 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotalTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCartPriceRuleSubtotal">
+    <test name="StorefrontCartPriceRuleSubtotalTest">
         <annotations>
             <features value="SalesRule"/>
             <stories value="Create cart price rule"/>
@@ -24,7 +24,7 @@
             <createData entity="_defaultProduct" stepKey="createPreReqProduct">
                 <requiredEntity createDataKey="createPreReqCategory"/>
             </createData>
-            <actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLength.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLengthTest.xml
similarity index 97%
rename from app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLength.xml
rename to app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLengthTest.xml
index a98de31b42f81..3befada509afa 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLength.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLengthTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCreateTaxRateInvalidPostcodeTestLength">
+    <test name="AdminCreateTaxRateInvalidPostcodeTestLengthTest">
         <annotations>
             <stories value="Create tax rate"/>
             <title value="Create tax rate, invalid post code length"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index 3d584f988780e..70211a1080951 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontTaxQuoteCartLoggedInSimple">
+    <test name="StorefrontTaxQuoteCartLoggedInSimpleTest">
         <annotations>
             <features value="Tax"/>
             <stories value="Tax Calculation in Shopping Cart"/>
@@ -127,7 +127,7 @@
     </test>
 
 
-    <test name="StorefrontTaxQuoteCartLoggedInVirtual">
+    <test name="StorefrontTaxQuoteCartLoggedInVirtualTest">
         <annotations>
             <features value="Tax"/>
             <stories value="Tax Calculation in Shopping Cart"/>
@@ -243,7 +243,7 @@
         <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
     </test>
 
-    <test name="StorefrontTaxQuoteCartGuestSimple">
+    <test name="StorefrontTaxQuoteCartGuestSimpleTest">
         <annotations>
             <features value="Tax"/>
             <stories value="Tax Calculation in Shopping Cart"/>
@@ -355,7 +355,7 @@
         <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
     </test>
 
-    <test name="StorefrontTaxQuoteCartGuestVirtual">
+    <test name="StorefrontTaxQuoteCartGuestVirtualTest">
         <annotations>
             <features value="Tax"/>
             <stories value="Tax Calculation in Shopping Cart"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
index 050ab3889984b..4c3ab91cf909c 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontTaxQuoteCheckoutGuestVirtual">
+    <test name="StorefrontTaxQuoteCheckoutGuestVirtualTest">
         <annotations>
             <features value="Tax"/>
             <stories value="Tax Calculation in One Page Checkout"/>
@@ -114,7 +114,7 @@
         <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
     </test>
 
-    <test name="StorefrontTaxQuoteCheckoutLoggedInSimple">
+    <test name="StorefrontTaxQuoteCheckoutLoggedInSimpleTest">
         <annotations>
             <features value="Tax"/>
             <stories value="Tax Calculation in One Page Checkout"/>
@@ -236,7 +236,7 @@
         <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
     </test>
 
-    <test name="StorefrontTaxQuoteCheckoutGuestSimple">
+    <test name="StorefrontTaxQuoteCheckoutGuestSimpleTest">
         <annotations>
             <features value="Tax"/>
             <stories value="Tax Calculation in One Page Checkout"/>
@@ -353,7 +353,7 @@
         <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
     </test>
 
-    <test name="StorefrontTaxQuoteCheckoutLoggedInVirtual">
+    <test name="StorefrontTaxQuoteCheckoutLoggedInVirtualTest">
         <annotations>
             <features value="Tax"/>
             <stories value="Tax Calculation in One Page Checkout"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
index f635df7edb6f7..31b6ed78aa57d 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
@@ -133,7 +133,7 @@
         <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-dutch/productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn5"/>
     </test>
-    <test name="AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTestWithConfigurationTurnedOff">
+    <test name="AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTestWithConfigurationTurnedOffTest">
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="Url Rewrites for Multiple Storeviews"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml
index 497ab653a0594..98c85114631aa 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml
@@ -83,7 +83,7 @@
         <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', $simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue7"/>
     </test>
 
-    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOff">
+    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOffTest">
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="Url-rewrites for product in anchor categories"/>
@@ -187,7 +187,7 @@
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName7"/>
     </test>
 
-    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestAllStoreView" extends="AdminUrlRewritesForProductInAnchorCategoriesTest">
+    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestAllStoreViewTest" extends="AdminUrlRewritesForProductInAnchorCategoriesTest">
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="Url-rewrites for product in anchor categories for all store views"/>
@@ -214,7 +214,7 @@
         <remove keyForRemoval="uncheckRedirect2"/>
     </test>
 
-    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestAllStoreViewWithConfigurationTurnedOff" extends="AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOff">
+    <test name="AdminUrlRewritesForProductInAnchorCategoriesTestAllStoreViewWithConfigurationTurnedOffTest" extends="AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOffTest">
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="Url-rewrites for product in anchor categories for all store views"/>
@@ -241,7 +241,7 @@
         <remove keyForRemoval="uncheckRedirect2"/>
     </test>
 
-    <test name="AdminUrlRewritesForProductsWithConfigurationTurnedOff">
+    <test name="AdminUrlRewritesForProductsWithConfigurationTurnedOffTest">
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="No Url-rewrites for product if configuration to generate url rewrite for Generate 'category/product' URL Rewrites is enabled "/>
diff --git a/app/code/Magento/Vault/Test/Mftf/Test/StorefrontVerifySecureURLRedirectVaultTest.xml b/app/code/Magento/Vault/Test/Mftf/Test/StorefrontVerifySecureURLRedirectVaultTest.xml
index c9d4cb3391cfd..f496e500a4d9b 100644
--- a/app/code/Magento/Vault/Test/Mftf/Test/StorefrontVerifySecureURLRedirectVaultTest.xml
+++ b/app/code/Magento/Vault/Test/Mftf/Test/StorefrontVerifySecureURLRedirectVaultTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectVault">
+    <test name="StorefrontVerifySecureURLRedirectVaultTest">
         <annotations>
             <features value="Vault"/>
             <stories value="Storefront Secure URLs"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontVerifySecureURLRedirectWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontVerifySecureURLRedirectWishlistTest.xml
index 21fa334a43196..72f5bab1e6af5 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontVerifySecureURLRedirectWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontVerifySecureURLRedirectWishlistTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectWishlist">
+    <test name="StorefrontVerifySecureURLRedirectWishlistTest">
         <annotations>
             <features value="Wishlist"/>
             <stories value="Storefront Secure URLs"/>