diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
index d8ce091fba76f..d2df6119aa98a 100644
--- a/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
@@ -29,7 +29,7 @@
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="categoryFirst" stepKey="deleteCategory"/>
             <actionGroup ref="ResetSearchEngineConfiguration" stepKey="resetCatalogSearchConfiguration"/>
-            <actionGroup ref="updateIndexerOnSave" stepKey="resetIndexerBackToOriginalState">
+            <actionGroup ref="UpdateIndexerOnSaveActionGroup" stepKey="resetIndexerBackToOriginalState">
                 <argument name="indexerName" value="catalogsearch_fulltext"/>
             </actionGroup>
             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
@@ -39,7 +39,7 @@
         <comment userInput="Change Catalog search engine option to Elastic Search 5.0+" stepKey="chooseElasticSearch5"/>
         <actionGroup ref="ChooseElasticSearchAsSearchEngine" stepKey="chooseES5"/>
         <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearing"/>
-        <actionGroup ref="updateIndexerBySchedule" stepKey="updateAnIndexerBySchedule">
+        <actionGroup ref="UpdateIndexerByScheduleActionGroup" stepKey="updateAnIndexerBySchedule">
             <argument name="indexerName" value="catalogsearch_fulltext"/>
         </actionGroup>
         <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
@@ -57,4 +57,4 @@
         <comment userInput="End of searching products" stepKey="endOfSearchingProducts"/>
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
         </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/UpdateIndexerByScheduleActionGroup.xml
similarity index 54%
rename from app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml
rename to app/code/Magento/Indexer/Test/Mftf/ActionGroup/UpdateIndexerByScheduleActionGroup.xml
index 642982f37866f..04a5b97469c8e 100644
--- a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/UpdateIndexerByScheduleActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="updateIndexerBySchedule">
+    <actionGroup name="UpdateIndexerByScheduleActionGroup">
         <annotations>
             <description>Goes to the Index Management page. Checks the provided Indexer Name. Selects 'Update by Schedule'. Clicks on Submit.</description>
         </annotations>
@@ -24,21 +24,4 @@
         <!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
         <waitForPageLoad stepKey="waitForSave"/>
     </actionGroup>
-
-    <actionGroup name="updateIndexerOnSave">
-        <annotations>
-            <description>Goes to the Index Management page. Checks the provided Indexer Name. Selects 'Update on Save'. Clicks on Submit.</description>
-        </annotations>
-        <arguments>
-            <argument name="indexerName" type="string"/>
-        </arguments>
-
-        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/indexer/indexer/list/" stepKey="amOnIndexManagementPage2"/>
-        <waitForPageLoad stepKey="waitForIndexManagementPageToLoad2"/>
-        <click selector="{{AdminIndexManagementSection.indexerCheckbox(indexerName)}}" stepKey="selectIndexer2"/>
-        <selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="change_mode_onthefly" stepKey="selectUpdateOnSave"/>
-        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm2"/>
-        <!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
-        <waitForPageLoad stepKey="waitForSave2"/>
-    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/UpdateIndexerOnSaveActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/UpdateIndexerOnSaveActionGroup.xml
new file mode 100644
index 0000000000000..65be57a335006
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/UpdateIndexerOnSaveActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="UpdateIndexerOnSaveActionGroup">
+        <annotations>
+            <description>Goes to the Index Management page. Checks the provided Indexer Name. Selects 'Update on Save'. Clicks on Submit.</description>
+        </annotations>
+        <arguments>
+            <argument name="indexerName" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/indexer/indexer/list/" stepKey="amOnIndexManagementPage2"/>
+        <waitForPageLoad stepKey="waitForIndexManagementPageToLoad2"/>
+        <click selector="{{AdminIndexManagementSection.indexerCheckbox(indexerName)}}" stepKey="selectIndexer2"/>
+        <selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="change_mode_onthefly" stepKey="selectUpdateOnSave"/>
+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm2"/>
+        <!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
+        <waitForPageLoad stepKey="waitForSave2"/>
+    </actionGroup>
+</actionGroups>