diff --git a/apps/web/playwright/fixtures/eventTypes.ts b/apps/web/playwright/fixtures/eventTypes.ts
index 77a42555ca..23fc4ee956 100644
--- a/apps/web/playwright/fixtures/eventTypes.ts
+++ b/apps/web/playwright/fixtures/eventTypes.ts
@@ -41,16 +41,15 @@ export function createEventTypeFixture(page: Page) {
       const saturday = (await localize("en"))("saturday");
       const save = (await localize("en"))("save");
       const copyTimesTo = (await localize("en"))("copy_times_to");
-      const availabilityUpdatedSuccessfully = (await localize("en"))("availability_updated_successfully");
 
       await page.getByTestId("availablity-title").click();
       // change availability name
       await page.getByTestId("availablity-title").fill("Working Hours test");
       await expect(page.getByTestId("subtitle")).toBeVisible();
-      await page.locator("label").filter({ hasText: sunday }).getByRole("switch").click();
-      await page.locator("div").filter({ hasText: monday }).first().click();
-      await page.locator("label").filter({ hasText: wednesday }).getByRole("switch").click();
-      await page.locator("label").filter({ hasText: saturday }).getByRole("switch").click();
+      await page.getByTestId(sunday).getByRole("switch").click();
+      await page.getByTestId(monday).first().click();
+      await page.getByTestId(wednesday).getByRole("switch").click();
+      await page.getByTestId(saturday).getByRole("switch").click();
       await page
         .locator("div")
         .filter({ hasText: "Sunday9:00am - 5:00pm" })
diff --git a/packages/features/schedules/components/Schedule.tsx b/packages/features/schedules/components/Schedule.tsx
index 5b6562f21d..16f04d3765 100644
--- a/packages/features/schedules/components/Schedule.tsx
+++ b/packages/features/schedules/components/Schedule.tsx
@@ -55,7 +55,7 @@ const ScheduleDay = <TFieldValues extends FieldValues>({
   const watchDayRange = watch(name);
 
   return (
-    <div className="mb-4 flex w-full flex-col last:mb-0 sm:flex-row sm:px-0">
+    <div className="mb-4 flex w-full flex-col last:mb-0 sm:flex-row sm:px-0" data-testid={weekday}>
       {/* Label & switch container */}
       <div className="flex h-[36px] items-center justify-between sm:w-32">
         <div>