diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateConfigurableProductWithSwatchAttributeMultipleStocks.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateConfigurableProductWithSwatchAttributeMultipleStocks.xml
index 6d63aab82b7b..0dc8a9b4cfbd 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateConfigurableProductWithSwatchAttributeMultipleStocks.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateConfigurableProductWithSwatchAttributeMultipleStocks.xml
@@ -18,7 +18,7 @@
             <group value="msi"/>
             <group value="multi_mode"/>
         </annotations>
-        
+
         <before>
             <!--Add store code to url.-->
             <magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlEnable"/>
@@ -164,15 +164,15 @@
         </actionGroup>
         <amOnPage url="$$configurableProduct.custom_attributes[url_key]$$.html" stepKey="navigateToProductPageMainWebsite"/>
         <waitForPageLoad stepKey="waitForMainWebsitePDPLoad"/>
-        <seeElement selector="//div[@option-label='{{visualSwatchColor1.name}}']" stepKey="verifyRedVariationIsPresentOnMainWebsite"/>
-        <dontSeeElement selector="//div[@option-label='{{visualSwatchColor2.name}}']" stepKey="verifyBlueVariationIsNotPresentOnMainWebsite"/>
+        <seeElement selector="//div[@data-option-label='{{visualSwatchColor1.name}}']" stepKey="verifyRedVariationIsPresentOnMainWebsite"/>
+        <dontSeeElement selector="//div[@data-option-label='{{visualSwatchColor2.name}}']" stepKey="verifyBlueVariationIsNotPresentOnMainWebsite"/>
         <!--Verify configurable product with blue variation on additional website.-->
         <amOnPage url="{{StorefrontHomePage.url}}/{{customStore.code}}/$$category.name$$.html" stepKey="navigateToAdditionalCategoryPage"/>
         <waitForPageLoad stepKey="waitForAdditionalWebsiteCategoryPageLoad"/>
         <see userInput="$$configurableProduct.name$$" stepKey="assertProductPresent"/>
         <amOnPage url="{{StorefrontHomePage.url}}/{{customStore.code}}/$$configurableProduct.custom_attributes[url_key]$$.html" stepKey="navigateToPDP"/>
         <waitForPageLoad stepKey="waitForAdditionalWebsitePDPLoad"/>
-        <dontSeeElement selector="//div[@option-label='{{visualSwatchColor1.name}}']" stepKey="verifyRedVariationIsNotPresentOnAdditionalWebsite"/>
-        <seeElement selector="//div[@option-label='{{visualSwatchColor2.name}}']" stepKey="verifyBlueVariationIsPresentOnAdditionalWebsite"/>
+        <dontSeeElement selector="//div[@data-option-label='{{visualSwatchColor1.name}}']" stepKey="verifyRedVariationIsNotPresentOnAdditionalWebsite"/>
+        <seeElement selector="//div[@data-option-label='{{visualSwatchColor2.name}}']" stepKey="verifyBlueVariationIsPresentOnAdditionalWebsite"/>
     </test>
 </tests>
diff --git a/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithSwatchAttributeTest.xml b/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithSwatchAttributeTest.xml
index 0ef241433e73..359d8576a050 100644
--- a/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithSwatchAttributeTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/StorefrontOrderCreatedWithConfigurableProductWithSwatchAttributeTest.xml
@@ -118,10 +118,10 @@
             <argument name="product" value="ConfigurableMsiProduct"/>
         </actionGroup>
 
-        <seeElement selector="//div[contains(@id, 'option-label-visual_swatch_')][@option-label='{{visualSwatchColor1.name}}']" stepKey="seeRedOption1"/>
-        <seeElement selector="//div[contains(@id, 'option-label-visual_swatch_')][@option-label='{{visualSwatchColor2.name}}']" stepKey="seeBlueOption1"/>
+        <seeElement selector="//div[contains(@id, 'option-label-visual_swatch_')][@data-option-label='{{visualSwatchColor1.name}}']" stepKey="seeRedOption1"/>
+        <seeElement selector="//div[contains(@id, 'option-label-visual_swatch_')][@data-option-label='{{visualSwatchColor2.name}}']" stepKey="seeBlueOption1"/>
 
-        <click selector="div[id*='option-label-visual_swatch_'][option-label='{{visualSwatchColor1.name}}']" stepKey="clickOnRedOption1"/>
+        <click selector="div[id*='option-label-visual_swatch_'][data-option-label='{{visualSwatchColor1.name}}']" stepKey="clickOnRedOption1"/>
         <waitForPageLoad stepKey="waitForPageLoad11"/>
         <see selector=".swatch-attribute-selected-option" userInput="{{visualSwatchColor1.name}}" stepKey="seeOptionName1"/>