diff --git a/cypress/elements/catalog/variants-selectors.js b/cypress/elements/catalog/variants-selectors.js
index 9763757b2..f53e7295e 100644
--- a/cypress/elements/catalog/variants-selectors.js
+++ b/cypress/elements/catalog/variants-selectors.js
@@ -1,6 +1,6 @@
 export const VARIANTS_SELECTORS = {
   attributeCheckbox: "[name*='value:']",
-  valueContainer: "[class*='valueContainer']",
+  valueContainer: "[data-test-id='value-container']",
   nextButton: "[class*='MuiButton-containedPrimary']",
   priceInput: "[name*='channel-price']",
   costPriceInput: "[name*='channel-costPrice']",
diff --git a/cypress/integration/products/menageProducts/availableForPurchaseProducts.js b/cypress/integration/products/menageProducts/availableForPurchaseProducts.js
index 39413c295..aa33c504e 100644
--- a/cypress/integration/products/menageProducts/availableForPurchaseProducts.js
+++ b/cypress/integration/products/menageProducts/availableForPurchaseProducts.js
@@ -1,6 +1,6 @@
 import faker from "faker";
 
-import ProductSteps from "../../../steps/productSteps";
+import ProductSteps from "../../../steps/products/productSteps";
 import { productDetailsUrl } from "../../../url/urlList";
 import ChannelsUtils from "../../../utils/channelsUtils";
 import ProductsUtils from "../../../utils/productsUtils";
diff --git a/cypress/integration/products/menageProducts/publishedProducts.js b/cypress/integration/products/menageProducts/publishedProducts.js
index 974f5756d..e5661b7bf 100644
--- a/cypress/integration/products/menageProducts/publishedProducts.js
+++ b/cypress/integration/products/menageProducts/publishedProducts.js
@@ -1,6 +1,6 @@
 import faker from "faker";
 
-import ProductSteps from "../../../steps/productSteps";
+import ProductSteps from "../../../steps/products/productSteps";
 import { productDetailsUrl } from "../../../url/urlList";
 import ChannelsUtils from "../../../utils/channelsUtils";
 import ProductsUtils from "../../../utils/productsUtils";
diff --git a/cypress/integration/products/menageProducts/visibleInListingsProducts.js b/cypress/integration/products/menageProducts/visibleInListingsProducts.js
index b41dc2df9..e34e1c413 100644
--- a/cypress/integration/products/menageProducts/visibleInListingsProducts.js
+++ b/cypress/integration/products/menageProducts/visibleInListingsProducts.js
@@ -1,6 +1,6 @@
 import faker from "faker";
 
-import ProductSteps from "../../../steps/productSteps";
+import ProductSteps from "../../../steps/products/productSteps";
 import { productDetailsUrl } from "../../../url/urlList";
 import ChannelsUtils from "../../../utils/channelsUtils";
 import ProductsUtils from "../../../utils/productsUtils";
diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx
index 3584aa14c..268a042c5 100644
--- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx
+++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx
@@ -39,7 +39,10 @@ const ProductVariantCreatorValues: React.FC<ProductVariantCreatorValuesProps> =
         <React.Fragment key={attribute.id}>
           <Card>
             <CardTitle title={attribute?.name || <Skeleton />} />
-            <CardContent className={classes.valueContainer}>
+            <CardContent
+              className={classes.valueContainer}
+              data-test-id="value-container"
+            >
               {attribute.values.map(value => (
                 <Debounce
                   debounceFn={() => onValueClick(attribute.id, value.slug)}
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index df842ab98..934e3b228 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -162968,6 +162968,7 @@ exports[`Storyshots Views / Products / Create multiple variants choose values 1`
       />
       <div
         class="MuiCardContent-root-id ProductVariantCreatorValues-valueContainer-id"
+        data-test-id="value-container"
       >
         <label
           class="MuiFormControlLabel-root-id"
@@ -163169,6 +163170,7 @@ exports[`Storyshots Views / Products / Create multiple variants choose values 1`
       />
       <div
         class="MuiCardContent-root-id ProductVariantCreatorValues-valueContainer-id"
+        data-test-id="value-container"
       >
         <label
           class="MuiFormControlLabel-root-id"
@@ -163364,6 +163366,7 @@ exports[`Storyshots Views / Products / Create multiple variants interactive 1`]
       />
       <div
         class="MuiCardContent-root-id ProductVariantCreatorValues-valueContainer-id"
+        data-test-id="value-container"
       >
         <label
           class="MuiFormControlLabel-root-id"
@@ -163473,6 +163476,7 @@ exports[`Storyshots Views / Products / Create multiple variants interactive 1`]
       />
       <div
         class="MuiCardContent-root-id ProductVariantCreatorValues-valueContainer-id"
+        data-test-id="value-container"
       >
         <label
           class="MuiFormControlLabel-root-id"
@@ -163662,6 +163666,7 @@ exports[`Storyshots Views / Products / Create multiple variants interactive 1`]
       />
       <div
         class="MuiCardContent-root-id ProductVariantCreatorValues-valueContainer-id"
+        data-test-id="value-container"
       >
         <label
           class="MuiFormControlLabel-root-id"
@@ -163771,6 +163776,7 @@ exports[`Storyshots Views / Products / Create multiple variants interactive 1`]
       />
       <div
         class="MuiCardContent-root-id ProductVariantCreatorValues-valueContainer-id"
+        data-test-id="value-container"
       >
         <label
           class="MuiFormControlLabel-root-id"