diff --git a/core/tests/ui/e2e/cart.spec.ts b/core/tests/ui/e2e/cart.spec.ts
index d25b8f6a1b..f62171c3fa 100644
--- a/core/tests/ui/e2e/cart.spec.ts
+++ b/core/tests/ui/e2e/cart.spec.ts
@@ -9,6 +9,7 @@ test.beforeEach(async ({ page }) => {
   ).toBeVisible();
 
   await page.getByRole('button', { name: 'Add to Cart' }).first().click();
+  await page.getByRole('button', { name: 'Add to Cart' }).first().isEnabled();
 });
 
 test('Add a single product to cart', async ({ page }) => {
diff --git a/core/tests/ui/e2e/checkout.spec.ts b/core/tests/ui/e2e/checkout.spec.ts
index 51ec9f9ce0..5c24269934 100644
--- a/core/tests/ui/e2e/checkout.spec.ts
+++ b/core/tests/ui/e2e/checkout.spec.ts
@@ -57,6 +57,7 @@ test.describe('desktop', () => {
     ).toBeVisible();
 
     await page.getByRole('button', { name: 'Add to Cart' }).first().click();
+    await page.getByRole('button', { name: 'Add to Cart' }).first().isEnabled();
     await page.getByRole('link', { name: 'Cart Items 1' }).click();
     await page.getByRole('heading', { level: 1, name: 'Your cart' }).click();
     await page.getByRole('button', { name: 'Proceed to checkout' }).click();
@@ -91,6 +92,7 @@ test.describe('desktop', () => {
       page.getByRole('heading', { level: 1, name: '[Sample] Laundry Detergent' }),
     ).toBeVisible();
     await page.getByRole('button', { name: 'Add to Cart' }).first().click();
+    await page.getByRole('button', { name: 'Add to Cart' }).first().isEnabled();
     await page.getByRole('link', { name: 'Cart Items 1' }).click();
     await page.getByRole('heading', { level: 1, name: 'Your cart' }).click();
     await page.getByRole('button', { name: 'Proceed to checkout' }).click();
@@ -121,6 +123,7 @@ test.describe('mobile', () => {
     ).toBeVisible();
 
     await page.getByRole('button', { name: 'Add to Cart' }).first().click();
+    await page.getByRole('button', { name: 'Add to Cart' }).first().isEnabled();
     await page.getByRole('link', { name: 'Cart Items 1' }).click();
     await page.getByRole('heading', { level: 1, name: 'Your cart' }).click();
     await page.getByRole('button', { name: 'Proceed to checkout' }).click();
diff --git a/core/tests/ui/e2e/coupon.spec.ts b/core/tests/ui/e2e/coupon.spec.ts
index 4a7c16357c..f2e8d5c515 100644
--- a/core/tests/ui/e2e/coupon.spec.ts
+++ b/core/tests/ui/e2e/coupon.spec.ts
@@ -9,6 +9,7 @@ test.beforeEach(async ({ page }) => {
   ).toBeVisible();
 
   await page.getByRole('button', { name: 'Add to Cart' }).first().click();
+  await page.getByRole('button', { name: 'Add to Cart' }).first().isEnabled();
 
   await page.getByRole('link', { name: 'Cart Items 1' }).click();
 
diff --git a/core/tests/ui/e2e/shipping.spec.ts b/core/tests/ui/e2e/shipping.spec.ts
index aa40eac971..92eb80290c 100644
--- a/core/tests/ui/e2e/shipping.spec.ts
+++ b/core/tests/ui/e2e/shipping.spec.ts
@@ -27,6 +27,7 @@ test.beforeEach(async ({ page }) => {
   ).toBeVisible();
 
   await page.getByRole('button', { name: 'Add to Cart' }).first().click();
+  await page.getByRole('button', { name: 'Add to Cart' }).first().isEnabled();
   await page.getByRole('link', { name: 'Cart Items 1' }).click();
 
   await expect(page.getByRole('heading', { level: 1, name: 'Your cart' })).toBeVisible();
diff --git a/core/tests/visual-regression/components/button.spec.ts b/core/tests/visual-regression/components/button.spec.ts
index fc9b286195..c812c50e0f 100644
--- a/core/tests/visual-regression/components/button.spec.ts
+++ b/core/tests/visual-regression/components/button.spec.ts
@@ -34,6 +34,7 @@ test('As a child', async ({ page }) => {
 
   // Act
   await page.getByRole('button', { name: 'Add to Cart' }).first().click();
+  await page.getByRole('button', { name: 'Add to Cart' }).first().isEnabled();
   await page.getByRole('link', { name: 'Cart Items 1' }).click();
   await page.getByText('Shipping cost').waitFor();
 
diff --git a/core/tests/visual-regression/components/input.spec.ts b/core/tests/visual-regression/components/input.spec.ts
index ecc804ab62..77c5aef3b7 100644
--- a/core/tests/visual-regression/components/input.spec.ts
+++ b/core/tests/visual-regression/components/input.spec.ts
@@ -9,6 +9,7 @@ test('Input with placeholder', async ({ page }) => {
 
   // Act
   await page.getByRole('button', { name: 'Add to Cart' }).first().click();
+  await page.getByRole('button', { name: 'Add to Cart' }).first().isEnabled();
   await page.getByRole('link', { name: 'Cart Items 1' }).click();
   await page.getByText('Shipping cost').waitFor();
   await page.getByRole('button', { name: 'Add' }).first().click();