diff --git a/dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/DeprecatedCommentActionGroup.xml b/dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/DeprecatedCommentActionGroup.xml
index 908808a8c..6c27627d5 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/DeprecatedCommentActionGroup.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/DeprecatedCommentActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeprecatedCommentActionGroup" deprecated="This Action Group is outdated and will be deleted next release.">
         <comment userInput="Action group to demonstrate deprecation notices." stepKey="comment" />
     </actionGroup>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Data/DeprecatedMessageData.xml b/dev/tests/functional/tests/MFTF/DevDocs/Data/DeprecatedMessageData.xml
index 5835a78af..1c2462c2f 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Data/DeprecatedMessageData.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Data/DeprecatedMessageData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="DeprecatedMessageData" deprecated="Entity is deprecated. Please use 'MessageData'.">
         <data key="message">Introduction to the Magento Functional Testing Framework</data>
     </entity>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Data/MessageData.xml b/dev/tests/functional/tests/MFTF/DevDocs/Data/MessageData.xml
index eb77e73bc..9c34b5672 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Data/MessageData.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Data/MessageData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="MessageData">
         <data key="message">Introduction to the Magento Functional Testing Framework</data>
     </entity>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Page/DeprecatedMFTFDocPage.xml b/dev/tests/functional/tests/MFTF/DevDocs/Page/DeprecatedMFTFDocPage.xml
index ee47fe954..8be64e9ca 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Page/DeprecatedMFTFDocPage.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Page/DeprecatedMFTFDocPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="DeprecatedMFTFDocPage" url="mftf/docs/introduction.html" area="storefront" module="MFTF_DevDocs" deprecated="New page was introduced. Please use 'MFTFDocPage'">
         <section name="contentSection" />
     </page>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Page/MFTFDocPage.xml b/dev/tests/functional/tests/MFTF/DevDocs/Page/MFTFDocPage.xml
index 88c577aef..9783fb0b3 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Page/MFTFDocPage.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Page/MFTFDocPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="MFTFDocPage" url="mftf/docs/introduction.html" area="storefront" module="MFTF_DevDocs">
         <section name="contentSection" />
     </page>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Section/ContentSection.xml b/dev/tests/functional/tests/MFTF/DevDocs/Section/ContentSection.xml
index 15af0fa39..c318fac3f 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Section/ContentSection.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Section/ContentSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="contentSection">
         <element name="pageIntro" type="text" selector=".page-intro"/>
         <element name="deprecatedPageIntro" type="text" selector=".page-intro-old" deprecated="New element was introduced. Please use 'contentSection.pageIntro'"/>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Section/DeprecatedContentSection.xml b/dev/tests/functional/tests/MFTF/DevDocs/Section/DeprecatedContentSection.xml
index cc316d6ed..8ed018146 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Section/DeprecatedContentSection.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Section/DeprecatedContentSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="DeprecatedContentSection" deprecated="New section was introduces. Please use 'contentSection'">
         <element name="pageIntro" type="text" selector=".page-intro"/>
     </section>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Test/DeprecatedDevDocsTest.xml b/dev/tests/functional/tests/MFTF/DevDocs/Test/DeprecatedDevDocsTest.xml
index c93dc8011..5944a964c 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Test/DeprecatedDevDocsTest.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Test/DeprecatedDevDocsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DeprecatedDevDocsTest" deprecated="Test is deprecated due to more stable test was introduces. Please use 'DevDocsTest'.">
         <annotations>
             <!--   Comment in Annotations for DevDocs Test are not affecting test generation  -->
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml b/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml
index c6b2575b9..592294889 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DevDocsTest">
         <annotations>
             <!--   Comment in Annotations for DevDocs Test are not affecting test generation  -->
diff --git a/dev/tests/verification/TestModule/ActionGroup/DeprecatedActionGroup.xml b/dev/tests/verification/TestModule/ActionGroup/DeprecatedActionGroup.xml
index 8f0341c09..f447ce76e 100644
--- a/dev/tests/verification/TestModule/ActionGroup/DeprecatedActionGroup.xml
+++ b/dev/tests/verification/TestModule/ActionGroup/DeprecatedActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeprecatedActionGroup" deprecated="Deprecated action group">
         <see stepKey="deprecatedSee" userInput="{{DeprecatedData.field}}" selector="{{DeprecatedSection.deprecatedElement}}" />
     </actionGroup>
diff --git a/dev/tests/verification/TestModule/ActionGroup/XmlCommentedActionGroup.xml b/dev/tests/verification/TestModule/ActionGroup/XmlCommentedActionGroup.xml
index a46dab939..9f1a429f7 100644
--- a/dev/tests/verification/TestModule/ActionGroup/XmlCommentedActionGroup.xml
+++ b/dev/tests/verification/TestModule/ActionGroup/XmlCommentedActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="XmlCommentedActionGroup">
         <arguments>
             <!--  Comments in arguments are not affecting test generation -->
diff --git a/dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml b/dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml
index af35b0134..90f7090b0 100644
--- a/dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml
+++ b/dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="xmlDuplicateActionGroup">
         <acceptPopup stepKey="ap1"/>
         <acceptPopup stepKey="ap2"/>
diff --git a/dev/tests/verification/TestModule/Data/DeprecatedData.xml b/dev/tests/verification/TestModule/Data/DeprecatedData.xml
index 060752419..7d5f1e200 100644
--- a/dev/tests/verification/TestModule/Data/DeprecatedData.xml
+++ b/dev/tests/verification/TestModule/Data/DeprecatedData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="DeprecatedData" deprecated="Data entity deprecated">
         <data key="field">deprecated</data>
     </entity>
diff --git a/dev/tests/verification/TestModule/Data/ExtendedData.xml b/dev/tests/verification/TestModule/Data/ExtendedData.xml
index 74fa921d0..c26715eec 100644
--- a/dev/tests/verification/TestModule/Data/ExtendedData.xml
+++ b/dev/tests/verification/TestModule/Data/ExtendedData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="parentData" type="data">
         <data key="name">name</data>
         <data key="uniqueNamePre" unique="prefix">prename</data>
diff --git a/dev/tests/verification/TestModule/Data/ParameterArrayData.xml b/dev/tests/verification/TestModule/Data/ParameterArrayData.xml
index 3b45aedf7..38f6a2439 100644
--- a/dev/tests/verification/TestModule/Data/ParameterArrayData.xml
+++ b/dev/tests/verification/TestModule/Data/ParameterArrayData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="simpleParamData" type="data">
         <data key="name">name</data>
         <data key="uniqueNamePre" unique="prefix">prename</data>
diff --git a/dev/tests/verification/TestModule/Data/PersistedReplacementData.xml b/dev/tests/verification/TestModule/Data/PersistedReplacementData.xml
index a8a747857..514b5eec6 100644
--- a/dev/tests/verification/TestModule/Data/PersistedReplacementData.xml
+++ b/dev/tests/verification/TestModule/Data/PersistedReplacementData.xml
@@ -8,7 +8,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ReplacementPerson" type="samplePerson">
         <data key="firstname">John</data>
         <data key="lastName">Doe</data>
diff --git a/dev/tests/verification/TestModule/Data/ReplacementData.xml b/dev/tests/verification/TestModule/Data/ReplacementData.xml
index 4d91fa84e..133fe8f6e 100644
--- a/dev/tests/verification/TestModule/Data/ReplacementData.xml
+++ b/dev/tests/verification/TestModule/Data/ReplacementData.xml
@@ -8,7 +8,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="simpleData" type="simpleData">
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
diff --git a/dev/tests/verification/TestModule/Page/DeprecatedPage.xml b/dev/tests/verification/TestModule/Page/DeprecatedPage.xml
index 316b8b1d7..e758c3f07 100644
--- a/dev/tests/verification/TestModule/Page/DeprecatedPage.xml
+++ b/dev/tests/verification/TestModule/Page/DeprecatedPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="DeprecatedPage" url="/test.html" area="storefront" module="UnknownVendor_TestModule" deprecated="Deprecated page">
         <section name="SampleSection"/>
     </page>
diff --git a/dev/tests/verification/TestModule/Section/DeprecatedSection.xml b/dev/tests/verification/TestModule/Section/DeprecatedSection.xml
index a9ed20d98..954889786 100644
--- a/dev/tests/verification/TestModule/Section/DeprecatedSection.xml
+++ b/dev/tests/verification/TestModule/Section/DeprecatedSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="DeprecatedSection" deprecated="Deprecated section">
         <element name="deprecatedElement" type="button" selector="#element" deprecated="Deprecated element"/>
     </section>
diff --git a/dev/tests/verification/TestModule/Section/LocatorFunctionSection.xml b/dev/tests/verification/TestModule/Section/LocatorFunctionSection.xml
index 28612e1b3..cc986d969 100644
--- a/dev/tests/verification/TestModule/Section/LocatorFunctionSection.xml
+++ b/dev/tests/verification/TestModule/Section/LocatorFunctionSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="LocatorFunctionSection">
         <element name="simpleLocator" type="button" locatorFunction="contains('label', 'Name')"/>
         <element name="simpleLocatorOneParam" type="button" locatorFunction="contains({{arg1}}, 'Name')" parameterized="true"/>
diff --git a/dev/tests/verification/TestModule/Section/SampleSection.xml b/dev/tests/verification/TestModule/Section/SampleSection.xml
index 920ee6e1b..088d3e344 100644
--- a/dev/tests/verification/TestModule/Section/SampleSection.xml
+++ b/dev/tests/verification/TestModule/Section/SampleSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="SampleSection">
         <element name="simpleElement" type="button" selector="#element"/>
         <element name="underscore_element" type="button" selector="#element"/>
diff --git a/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuite1.xml b/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuite1.xml
index 8f5f4145e..5f78e043e 100644
--- a/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuite1.xml
+++ b/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuite1.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="functionalSuite1">
         <include>
             <group name = "include" />
diff --git a/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuite2.xml b/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuite2.xml
index 5f926fbc3..c65cf6cfc 100644
--- a/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuite2.xml
+++ b/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuite2.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="functionalSuite2">
         <include>
             <group name="include"/>
diff --git a/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuiteWithComments.xml b/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuiteWithComments.xml
index 471f2312d..ffc0e15db 100644
--- a/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuiteWithComments.xml
+++ b/dev/tests/verification/TestModule/Suite/functionalSuite/functionalSuiteWithComments.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="functionalSuiteWithComments">
         <include>
             <!-- Comment Block-->
diff --git a/dev/tests/verification/TestModule/Suite/functionalSuiteExtends.xml b/dev/tests/verification/TestModule/Suite/functionalSuiteExtends.xml
index aac3b51e5..44af78d20 100644
--- a/dev/tests/verification/TestModule/Suite/functionalSuiteExtends.xml
+++ b/dev/tests/verification/TestModule/Suite/functionalSuiteExtends.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="suiteExtends">
         <include>
             <group name="ExtendedTestInSuite"/>
diff --git a/dev/tests/verification/TestModule/Suite/functionalSuiteHooks.xml b/dev/tests/verification/TestModule/Suite/functionalSuiteHooks.xml
index f86f8c43c..4fc459e7d 100644
--- a/dev/tests/verification/TestModule/Suite/functionalSuiteHooks.xml
+++ b/dev/tests/verification/TestModule/Suite/functionalSuiteHooks.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="functionalSuiteHooks">
         <include>
             <test name="IncludeTest"/>
diff --git a/dev/tests/verification/TestModule/Test/AssertTest.xml b/dev/tests/verification/TestModule/Test/AssertTest.xml
index 753ccedf1..d17b60fae 100644
--- a/dev/tests/verification/TestModule/Test/AssertTest.xml
+++ b/dev/tests/verification/TestModule/Test/AssertTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AssertTest">
         <before>
             <createData entity="ReplacementPerson" stepKey="createData1"/>
diff --git a/dev/tests/verification/TestModule/Test/CharacterReplacementTest.xml b/dev/tests/verification/TestModule/Test/CharacterReplacementTest.xml
index 9a8c0f17d..85b3fb34e 100644
--- a/dev/tests/verification/TestModule/Test/CharacterReplacementTest.xml
+++ b/dev/tests/verification/TestModule/Test/CharacterReplacementTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CharacterReplacementTest">
         <click stepKey="charsInSectionElement" selector="{{SampleSection.underscore_element}}"/>
         <fillField stepKey="charsInDataRef" selector="{{SampleSection.underscore_element}}" userInput="{{simpleData.street[0]}}"/>
diff --git a/dev/tests/verification/TestModule/Test/DataActionsTest.xml b/dev/tests/verification/TestModule/Test/DataActionsTest.xml
index 03d7caa35..b75bc98f8 100644
--- a/dev/tests/verification/TestModule/Test/DataActionsTest.xml
+++ b/dev/tests/verification/TestModule/Test/DataActionsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DataActionsTest">
         <before>
             <createData entity="entity" stepKey="createdInBefore"/>
diff --git a/dev/tests/verification/TestModule/Test/DataReplacementTest.xml b/dev/tests/verification/TestModule/Test/DataReplacementTest.xml
index ae11b6fdc..f33a95b50 100644
--- a/dev/tests/verification/TestModule/Test/DataReplacementTest.xml
+++ b/dev/tests/verification/TestModule/Test/DataReplacementTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DataReplacementTest">
         <fillField stepKey="inputReplace" selector="#selector" userInput="StringBefore {{simpleData.firstname}} StringAfter"/>
         <seeCurrentUrlMatches stepKey="seeInRegex" regex="~\/{{simpleData.firstname}}~i"/>
diff --git a/dev/tests/verification/TestModule/Test/DeprecatedEntitiesTest.xml b/dev/tests/verification/TestModule/Test/DeprecatedEntitiesTest.xml
index 733a34e80..20c7ccd0b 100644
--- a/dev/tests/verification/TestModule/Test/DeprecatedEntitiesTest.xml
+++ b/dev/tests/verification/TestModule/Test/DeprecatedEntitiesTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DeprecatedEntitiesTest">
         <actionGroup ref="DeprecatedActionGroup" stepKey="deprecatedActionGroup" />
         <amOnPage url="{{DeprecatedPage.url}}" stepKey="amOnPage" />
diff --git a/dev/tests/verification/TestModule/Test/DeprecatedTest.xml b/dev/tests/verification/TestModule/Test/DeprecatedTest.xml
index cc5ae4994..075e8add3 100644
--- a/dev/tests/verification/TestModule/Test/DeprecatedTest.xml
+++ b/dev/tests/verification/TestModule/Test/DeprecatedTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DeprecatedTest" deprecated="Test is deprecated">
         <actionGroup ref="DeprecatedActionGroup" stepKey="deprecatedActionGroup" />
         <amOnPage url="{{DeprecatedPage.url}}" stepKey="amOnPage" />
diff --git a/dev/tests/verification/TestModule/Test/ExecuteJsTest.xml b/dev/tests/verification/TestModule/Test/ExecuteJsTest.xml
index b361cdd28..ea80275e1 100644
--- a/dev/tests/verification/TestModule/Test/ExecuteJsTest.xml
+++ b/dev/tests/verification/TestModule/Test/ExecuteJsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ExecuteJsEscapingTest">
         <executeJS function="return $javascriptVariable" stepKey="javaVariableEscape"/>
         <executeJS function="return {$doNotEscape}" stepKey="mftfVariableNotEscaped"/>
diff --git a/dev/tests/verification/TestModule/Test/ExtendedDataTest.xml b/dev/tests/verification/TestModule/Test/ExtendedDataTest.xml
index 21f06eb3a..053b26c38 100644
--- a/dev/tests/verification/TestModule/Test/ExtendedDataTest.xml
+++ b/dev/tests/verification/TestModule/Test/ExtendedDataTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ExtendParentDataTest">
         <createData entity="extendParentData" stepKey="simpleDataKey"/>
         <searchAndMultiSelectOption selector="#selector" parameterArray="[{{extendParentData.name}}]" stepKey="getName"/>
diff --git a/dev/tests/verification/TestModule/Test/HookActionsTest.xml b/dev/tests/verification/TestModule/Test/HookActionsTest.xml
index 7e3521e4f..0a26256d0 100644
--- a/dev/tests/verification/TestModule/Test/HookActionsTest.xml
+++ b/dev/tests/verification/TestModule/Test/HookActionsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="HookActionsTest">
         <before>
             <createData entity="sampleCreatedEntity" stepKey="sampleCreateBefore"/>
diff --git a/dev/tests/verification/TestModule/Test/LocatorFunctionTest.xml b/dev/tests/verification/TestModule/Test/LocatorFunctionTest.xml
index f9caa59fc..eefd75e1f 100644
--- a/dev/tests/verification/TestModule/Test/LocatorFunctionTest.xml
+++ b/dev/tests/verification/TestModule/Test/LocatorFunctionTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="LocatorFunctionTest">
         <createData entity="ReplacementPerson" stepKey="data"/>
 
diff --git a/dev/tests/verification/TestModule/Test/PageReplacementTest.xml b/dev/tests/verification/TestModule/Test/PageReplacementTest.xml
index b6adee5d7..8cd6fe572 100644
--- a/dev/tests/verification/TestModule/Test/PageReplacementTest.xml
+++ b/dev/tests/verification/TestModule/Test/PageReplacementTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="PageReplacementTest">
         <createData entity="simpleData" stepKey="datakey"/>
         <amOnPage stepKey="noParamPage" url="{{NoParamPage.url}}"/>
diff --git a/dev/tests/verification/TestModule/Test/ParameterArrayTest.xml b/dev/tests/verification/TestModule/Test/ParameterArrayTest.xml
index e9bef4244..8bb57ae74 100644
--- a/dev/tests/verification/TestModule/Test/ParameterArrayTest.xml
+++ b/dev/tests/verification/TestModule/Test/ParameterArrayTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ParameterArrayTest">
         <createData entity="simpleParamData" stepKey="simpleDataKey"/>
         <searchAndMultiSelectOption selector="#selector" parameterArray="[{{simpleParamData.name}}]" stepKey="xmlSimpleReplace"/>
diff --git a/dev/tests/verification/TestModule/Test/PersistedReplacementTest.xml b/dev/tests/verification/TestModule/Test/PersistedReplacementTest.xml
index 4b0f3c902..ba86a1a5d 100644
--- a/dev/tests/verification/TestModule/Test/PersistedReplacementTest.xml
+++ b/dev/tests/verification/TestModule/Test/PersistedReplacementTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="PersistedReplacementTest">
         <before>
             <createData entity="ReplacementPerson" stepKey="createData1"/>
diff --git a/dev/tests/verification/TestModule/Test/PersistenceActionGroupAppendingTest.xml b/dev/tests/verification/TestModule/Test/PersistenceActionGroupAppendingTest.xml
index 20a9b6a28..c76409f26 100644
--- a/dev/tests/verification/TestModule/Test/PersistenceActionGroupAppendingTest.xml
+++ b/dev/tests/verification/TestModule/Test/PersistenceActionGroupAppendingTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="PersistenceActionGroupAppendingTest">
         <before>
             <actionGroup ref="DataPersistenceAppendingActionGroup" stepKey="ACTIONGROUPBEFORE"/>
diff --git a/dev/tests/verification/TestModule/Test/PersistenceCustomFieldsTest.xml b/dev/tests/verification/TestModule/Test/PersistenceCustomFieldsTest.xml
index c56106693..77a85060b 100644
--- a/dev/tests/verification/TestModule/Test/PersistenceCustomFieldsTest.xml
+++ b/dev/tests/verification/TestModule/Test/PersistenceCustomFieldsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="PersistenceCustomFieldsTest">
         <before>
             <createData entity="DefaultPerson" stepKey="createData1">
diff --git a/dev/tests/verification/TestModule/Test/SecretCredentialDataTest.xml b/dev/tests/verification/TestModule/Test/SecretCredentialDataTest.xml
index 4044a86e3..d87be5d3b 100644
--- a/dev/tests/verification/TestModule/Test/SecretCredentialDataTest.xml
+++ b/dev/tests/verification/TestModule/Test/SecretCredentialDataTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="secretCredentialDataTest">
         <createData entity="_defaultProduct" stepKey="createProductWithFieldOverridesUsingHardcodedData1">
             <field key="qty">123</field>
diff --git a/dev/tests/verification/TestModule/Test/SectionReplacementTest.xml b/dev/tests/verification/TestModule/Test/SectionReplacementTest.xml
index 17aeb4d69..3b066fcdf 100644
--- a/dev/tests/verification/TestModule/Test/SectionReplacementTest.xml
+++ b/dev/tests/verification/TestModule/Test/SectionReplacementTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SectionReplacementTest">
         <click stepKey="selectorReplace" selector="{{SampleSection.simpleElement}}"/>
         <click stepKey="selectorReplaceTimeout" selector="{{SampleSection.timeoutElement}}"/>
diff --git a/dev/tests/verification/TestModule/Test/XmlCommentedActionGroupTest.xml b/dev/tests/verification/TestModule/Test/XmlCommentedActionGroupTest.xml
index f7fbd8dd6..b464dfc4c 100644
--- a/dev/tests/verification/TestModule/Test/XmlCommentedActionGroupTest.xml
+++ b/dev/tests/verification/TestModule/Test/XmlCommentedActionGroupTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="XmlCommentedActionGroupTest">
         <annotations>
             <severity value="CRITICAL"/>
diff --git a/dev/tests/verification/TestModule/Test/XmlCommentedTest.xml b/dev/tests/verification/TestModule/Test/XmlCommentedTest.xml
index 133588872..1da6a1fc0 100644
--- a/dev/tests/verification/TestModule/Test/XmlCommentedTest.xml
+++ b/dev/tests/verification/TestModule/Test/XmlCommentedTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <!--< > & $abc " abc ' <click stepKey="click" userInput="$$createDataHook.firstname$$" selector="#id">/-->
     <test name="XmlCommentedTest">
         <annotations>
diff --git a/dev/tests/verification/TestModuleMerged/Data/MergeData.xml b/dev/tests/verification/TestModuleMerged/Data/MergeData.xml
index 72d0dca61..531922aed 100644
--- a/dev/tests/verification/TestModuleMerged/Data/MergeData.xml
+++ b/dev/tests/verification/TestModuleMerged/Data/MergeData.xml
@@ -8,7 +8,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="DefaultPerson" type="samplePerson">
         <data key="mergedField">merged</data>
         <data key="newField">newField</data>
diff --git a/dev/tests/verification/TestModuleMerged/Section/MergeSection.xml b/dev/tests/verification/TestModuleMerged/Section/MergeSection.xml
index fb661e906..6bbd862ae 100644
--- a/dev/tests/verification/TestModuleMerged/Section/MergeSection.xml
+++ b/dev/tests/verification/TestModuleMerged/Section/MergeSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="SampleSection">
         <element name="oneParamElement" type="button" selector="#element .{{var1}}" parameterized="true"/>
         <element name="twoParamElement" type="button" selector="#{{var1}} .{{var2}}" parameterized="true"/>
diff --git a/dev/tests/verification/TestModuleMerged/Test/MergeXmlDuplicateTest.xml b/dev/tests/verification/TestModuleMerged/Test/MergeXmlDuplicateTest.xml
index 2d99d5cbc..c9c731134 100644
--- a/dev/tests/verification/TestModuleMerged/Test/MergeXmlDuplicateTest.xml
+++ b/dev/tests/verification/TestModuleMerged/Test/MergeXmlDuplicateTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BasicDupedActionTest">
         <before>
             <createData entity="simpleData" stepKey="cb3">
diff --git a/docs/commands/mftf.md b/docs/commands/mftf.md
index 9b16e23a4..ee6c94ed6 100644
--- a/docs/commands/mftf.md
+++ b/docs/commands/mftf.md
@@ -506,16 +506,18 @@ vendor/bin/mftf static-checks testDependencies actionGroupArguments
     
 ### `upgrade:tests`
 
-When the path argument is specified, this command applies all the major version MFTF upgrade scripts to the test components in the given path (test.xml, data.xml, etc).
+When the path argument is specified, this `upgrade` command applies all the major version MFTF upgrade scripts to a `Test Module` in the given path.
 Otherwise, it will apply all the major version MFTF upgrade scripts to all installed test components.
 
+`Test Module` should have the directory structure of ActionGroup, Data, Metadata, Page, Section, Test, and Suite.
+
 #### Usage
 
 ```bash
 vendor/bin/mftf upgrade:tests [<path>]
 ```
 
-`<path>` is the path that contains MFTF test components that need to be upgraded.
+`<path>` is the path to a MFTF `Test Module` that needs to be upgraded.
 The command searches recursively for any `*.xml` files to upgrade.
 
 #### Examples
diff --git a/src/Magento/FunctionalTestingFramework/Upgrade/UpdateTestSchemaPaths.php b/src/Magento/FunctionalTestingFramework/Upgrade/UpdateTestSchemaPaths.php
index 7a08b39df..09140d1cd 100644
--- a/src/Magento/FunctionalTestingFramework/Upgrade/UpdateTestSchemaPaths.php
+++ b/src/Magento/FunctionalTestingFramework/Upgrade/UpdateTestSchemaPaths.php
@@ -9,7 +9,6 @@
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Util\Script\ScriptUtil;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -19,6 +18,35 @@
  */
 class UpdateTestSchemaPaths implements UpgradeInterface
 {
+    /**
+     * OutputInterface
+     *
+     * @var OutputInterface
+     */
+    private $output;
+
+    /**
+     * Total test updated
+     *
+     * @var integer
+     */
+    private $testsUpdated = 0;
+
+    /**
+     * Entity type to urn map
+     *
+     * @var array
+     */
+    private $typeToUrns = [
+        'ActionGroup' => 'urn:magento:mftf:Test/etc/actionGroupSchema.xsd',
+        'Data' => 'urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd',
+        'Metadata' => 'urn:magento:mftf:DataGenerator/etc/dataOperation.xsd',
+        'Page' => 'urn:magento:mftf:Page/etc/PageObject.xsd',
+        'Section' => 'urn:magento:mftf:Page/etc/SectionObject.xsd',
+        'Suite' => 'urn:magento:mftf:Suite/etc/suiteSchema.xsd',
+        'Test' => 'urn:magento:mftf:Test/etc/testSchema.xsd',
+    ];
+
     /**
      * Upgrades all test xml files, replacing relative schema paths to URN.
      *
@@ -29,56 +57,42 @@ class UpdateTestSchemaPaths implements UpgradeInterface
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        // @codingStandardsIgnoreStart
-        $relativeToUrn = [
-            "dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd"
-                => "urn:magento:mftf:DataGenerator/etc/dataOperation.xsd",
-            "dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd"
-                => "urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd",
-            "dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd"
-                => "urn:magento:mftf:Page/etc/PageObject.xsd",
-            "dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"
-                => "urn:magento:mftf:Page/etc/SectionObject.xsd",
-            "dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"
-                => "urn:magento:mftf:Test/etc/actionGroupSchema.xsd",
-            "dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"
-                => "urn:magento:mftf:Test/etc/testSchema.xsd",
-            "dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd"
-                => "urn:magento:mftf:Suite/etc/suiteSchema.xsd"
-        ];
-        // @codingStandardsIgnoreEnd
-
-        $relativePatterns = [];
-        $urns = [];
-        // Prepare array of patterns to URNs for preg_replace (replace / to escapes
-        foreach ($relativeToUrn as $relative => $urn) {
-            $relativeReplaced = str_replace('/', '\/', $relative);
-            $relativePatterns[] = '/[.\/]+' . $relativeReplaced  . '/';
-            $urns[] = $urn;
-        }
-
-        $testsUpdated = 0;
+        $this->output = $output;
+        $this->testsUpdated = 0;
         $testPaths[] = $input->getArgument('path');
         if (empty($testPaths[0])) {
             $testPaths = ScriptUtil::getAllModulePaths();
         }
 
-        foreach ($testPaths as $testsPath) {
-            $finder = new Finder();
-            $finder->files()->in($testsPath)->name("*.xml");
+        // Process module xml files
+        foreach ($this->typeToUrns as $type => $urn) {
+            $xmlFiles = ScriptUtil::getModuleXmlFilesByScope($testPaths, $type);
+            $this->processXmlFiles($xmlFiles, $urn);
+        }
+
+        return ("Schema Path updated to use MFTF URNs in {$this->testsUpdated} file(s).");
+    }
 
-            $fileSystem = new Filesystem();
-            foreach ($finder->files() as $file) {
-                $count = 0;
-                $contents = $file->getContents();
-                $contents = preg_replace($relativePatterns, $urns, $contents, -1, $count);
-                $fileSystem->dumpFile($file->getRealPath(), $contents);
-                if ($count > 0) {
-                    $testsUpdated++;
+    /**
+     * Convert xml schema location from non urn based to urn based
+     *
+     * @param Finder $xmlFiles
+     * @param string $urn
+     * @return void
+     */
+    private function processXmlFiles($xmlFiles, $urn)
+    {
+        $pattern = '/xsi:noNamespaceSchemaLocation[\s]*=[\s]*"(?<urn>[^\<\>"\']*)"/';
+        foreach ($xmlFiles as $file) {
+            $filePath = $file->getRealPath();
+            $contents = $file->getContents();
+            preg_match($pattern, $contents, $matches);
+            if (isset($matches['urn'])) {
+                if (trim($matches['urn']) !== $urn) {
+                    file_put_contents($filePath, str_replace($matches['urn'], $urn, $contents));
+                    $this->testsUpdated++;
                 }
             }
         }
-
-        return ("Schema Path updated to use MFTF URNs in {$testsUpdated} file(s).");
     }
 }