diff --git a/packages/lib/src/breadcrumbs/Breadcrumbs.test.tsx b/packages/lib/src/breadcrumbs/Breadcrumbs.test.tsx
index d04f6af56..98400eca2 100644
--- a/packages/lib/src/breadcrumbs/Breadcrumbs.test.tsx
+++ b/packages/lib/src/breadcrumbs/Breadcrumbs.test.tsx
@@ -1,5 +1,4 @@
-import { render } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
+import { fireEvent, render } from "@testing-library/react";
 import DxcBreadcrumbs from "./Breadcrumbs";
 
 global.ResizeObserver = jest.fn().mockImplementation(() => ({
@@ -39,7 +38,7 @@ describe("Breadcrumbs component tests", () => {
     const dropdown = getByRole("button");
     expect(queryByText("User Menu")).toBeFalsy();
     expect(queryByText("Preferences")).toBeFalsy();
-    userEvent.click(dropdown);
+    fireEvent.click(dropdown);
     expect(getByText("User Menu")).toBeTruthy();
     expect(getByText("Preferences")).toBeTruthy();
   });
@@ -51,7 +50,7 @@ describe("Breadcrumbs component tests", () => {
     expect(queryByText("Home")).toBeFalsy();
     expect(queryByText("User Menu")).toBeFalsy();
     expect(queryByText("Preferences")).toBeFalsy();
-    userEvent.click(dropdown);
+    fireEvent.click(dropdown);
     expect(getByText("Home")).toBeTruthy();
     expect(getByText("User Menu")).toBeTruthy();
     expect(getByText("Preferences")).toBeTruthy();
@@ -73,7 +72,7 @@ describe("Breadcrumbs component tests", () => {
         ]}
       />
     );
-    userEvent.click(getByText("Home"));
+    fireEvent.click(getByText("Home"));
     expect(onItemClick).toHaveBeenCalledWith("/home");
   });
   test("The onClick prop from an item is properly called (collapsed)", () => {
@@ -89,8 +88,8 @@ describe("Breadcrumbs component tests", () => {
         itemsBeforeCollapse={2}
       />
     );
-    userEvent.click(getByRole("button"));
-    userEvent.click(getByText("Preferences"));
+    fireEvent.click(getByRole("button"));
+    fireEvent.click(getByText("Preferences"));
     expect(onItemClick).toHaveBeenCalledWith("/");
   });
   test("handleOnClick prevents default and calls onClick when href is provided", () => {
@@ -105,7 +104,7 @@ describe("Breadcrumbs component tests", () => {
       />
     );
     const homeLink = getByText("Home");
-    userEvent.click(homeLink);
+    fireEvent.click(homeLink);
     expect(onItemClick).toHaveBeenCalledWith("/home");
   });
   test("handleOnMouseEnter sets title when text overflows", () => {
@@ -124,8 +123,7 @@ describe("Breadcrumbs component tests", () => {
     Object.defineProperty(currentPageElement, "scrollWidth", { value: 200, configurable: true });
     Object.defineProperty(currentPageElement, "clientWidth", { value: 100, configurable: true });
 
-    // Simulate mouse enter
-    userEvent.hover(currentPageElement);
+    fireEvent.mouseEnter(currentPageElement);
 
     // Check if title is set when there's overflow
     expect(currentPageElement.title).toBe("Very Long Current Page Label That Should Overflow");
diff --git a/packages/lib/src/contextual-menu/ContextualMenu.test.tsx b/packages/lib/src/contextual-menu/ContextualMenu.test.tsx
index 06958825d..ea134bc05 100644
--- a/packages/lib/src/contextual-menu/ContextualMenu.test.tsx
+++ b/packages/lib/src/contextual-menu/ContextualMenu.test.tsx
@@ -31,12 +31,13 @@ const groups = [
 ];
 
 describe("Contextual menu component tests", () => {
-  test("Single — Renders with correct aria attributes", () => {
+  test("Single — Renders with correct aria attributes", async () => {
+    const user = userEvent.setup();
     const { getAllByRole, getByRole } = render(<DxcContextualMenu items={items} />);
     expect(getAllByRole("menuitem").length).toBe(4);
     const actions = getAllByRole("button");
     if (actions[0] != null) {
-      userEvent.click(actions[0]);
+      await user.click(actions[0]);
     }
     expect(actions[0]?.getAttribute("aria-pressed")).toBeTruthy();
     expect(getByRole("menu")).toBeTruthy();
@@ -52,39 +53,41 @@ describe("Contextual menu component tests", () => {
     const item = getByRole("button");
     expect(item.getAttribute("aria-pressed")).toBeTruthy();
   });
-  test("Group — Group items collapse when clicked", () => {
+  test("Group — Group items collapse when clicked", async () => {
+    const user = userEvent.setup();
     const { queryByText, getByText } = render(<DxcContextualMenu items={groups} />);
-    userEvent.click(getByText("Grouped Item 1"));
+    await user.click(getByText("Grouped Item 1"));
     expect(getByText("Item 1")).toBeTruthy();
     expect(getByText("Grouped Item 2")).toBeTruthy();
-    userEvent.click(getByText("Grouped Item 2"));
+    await user.click(getByText("Grouped Item 2"));
     expect(getByText("Item 2")).toBeTruthy();
     expect(getByText("Item 3")).toBeTruthy();
-    userEvent.click(getByText("Grouped Item 1"));
+    await user.click(getByText("Grouped Item 1"));
     expect(queryByText("Item 1")).toBeFalsy();
     expect(queryByText("Item 2")).toBeFalsy();
     expect(queryByText("Item 3")).toBeFalsy();
   });
-  test("Group — Renders with correct aria attributes", () => {
+  test("Group — Renders with correct aria attributes", async () => {
+    const user = userEvent.setup();
     const { getAllByRole } = render(<DxcContextualMenu items={groups} />);
     const group1 = getAllByRole("button")[0];
     if (group1 != null) {
-      userEvent.click(group1);
+      await user.click(group1);
     }
     expect(group1?.getAttribute("aria-expanded")).toBeTruthy();
     expect(group1?.getAttribute("aria-controls")).toBe(group1?.nextElementSibling?.id);
     const expandedGroupItem1 = getAllByRole("button")[2];
     if (expandedGroupItem1 != null) {
-      userEvent.click(expandedGroupItem1);
+      await user.click(expandedGroupItem1);
     }
     const expandedGroupedItem2 = getAllByRole("button")[6];
     if (expandedGroupedItem2 != null) {
-      userEvent.click(expandedGroupedItem2);
+      await user.click(expandedGroupedItem2);
     }
     expect(getAllByRole("menuitem").length).toBe(10);
     const optionToBeClicked = getAllByRole("button")[4];
     if (optionToBeClicked != null) {
-      userEvent.click(optionToBeClicked);
+      await user.click(optionToBeClicked);
     }
     expect(optionToBeClicked?.getAttribute("aria-pressed")).toBeTruthy();
   });
@@ -99,39 +102,41 @@ describe("Contextual menu component tests", () => {
     expect(getByText("Tested item")).toBeTruthy();
     expect(getAllByRole("button")[1]?.getAttribute("aria-pressed")).toBeTruthy();
   });
-  test("Group — Collapsed groups render as selected when containing a selected item", () => {
+  test("Group — Collapsed groups render as selected when containing a selected item", async () => {
+    const user = userEvent.setup();
     const { getAllByRole } = render(<DxcContextualMenu items={groups} />);
     const group1 = getAllByRole("button")[0];
     if (group1 != null) {
-      userEvent.click(group1);
+      await user.click(group1);
     }
     const group2 = getAllByRole("button")[2];
     if (group2 != null) {
-      userEvent.click(group2);
+      await user.click(group2);
     }
     const item = getAllByRole("button")[3];
     if (item != null) {
-      userEvent.click(item);
+      await user.click(item);
     }
     expect(item?.getAttribute("aria-pressed")).toBeTruthy();
     expect(group1?.getAttribute("aria-pressed")).toBe("false");
     expect(group2?.getAttribute("aria-pressed")).toBe("false");
     if (group2 != null) {
-      userEvent.click(group2);
+      await user.click(group2);
     }
     expect(group2?.getAttribute("aria-pressed")).toBe("true");
     if (group1 != null) {
-      userEvent.click(group1);
+      await user.click(group1);
     }
     expect(group1?.getAttribute("aria-pressed")).toBe("true");
   });
-  test("Sections — Renders with correct aria attributes", () => {
+  test("Sections — Renders with correct aria attributes", async () => {
+    const user = userEvent.setup();
     const { getAllByRole, getByText } = render(<DxcContextualMenu items={sections} />);
     expect(getAllByRole("region").length).toBe(2);
     expect(getAllByRole("menuitem").length).toBe(6);
     const actions = getAllByRole("button");
     if (actions[0] != null) {
-      userEvent.click(actions[0]);
+      await user.click(actions[0]);
     }
     expect(actions[0]?.getAttribute("aria-pressed")).toBeTruthy();
     expect(getAllByRole("menu").length).toBe(2);
diff --git a/packages/lib/src/dialog/Dialog.test.tsx b/packages/lib/src/dialog/Dialog.test.tsx
index 0dfb24831..62fb3f709 100644
--- a/packages/lib/src/dialog/Dialog.test.tsx
+++ b/packages/lib/src/dialog/Dialog.test.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, waitFor } from "@testing-library/react";
+import { fireEvent, render } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import DxcButton from "../button/Button";
 import DxcCard from "../card/Card";
@@ -76,7 +76,7 @@ describe("Dialog component tests", () => {
       </DxcDialog>
     );
     const calendarAction = getByRole("combobox");
-    userEvent.click(calendarAction);
+    fireEvent.click(calendarAction);
     fireEvent.keyDown(document.activeElement!, {
       key: "Escape",
       code: "Escape",
@@ -88,14 +88,15 @@ describe("Dialog component tests", () => {
 });
 
 describe("Dialog component: Focus lock tests", () => {
-  test("Close action: when there's no focusable content, the focus never leaves the close action (unless you click outside)", () => {
+  test("Close action: when there's no focusable content, the focus never leaves the close action (unless you click outside)", async () => {
+    const user = userEvent.setup({ delay: null });
     const onClick = jest.fn();
     const { getByRole } = render(<DxcDialog onCloseClick={onClick}>example-dialog</DxcDialog>);
     const button = getByRole("button");
     const dialog = getByRole("dialog");
     expect(document.activeElement).toEqual(button);
     expect(button.getAttribute("aria-label")).toBe("Close dialog");
-    userEvent.tab();
+    await user.tab();
     expect(document.activeElement).toEqual(button);
     fireEvent.keyDown(dialog, { key: "Tab", shiftKey: true });
     expect(document.activeElement).toEqual(button);
@@ -202,9 +203,12 @@ describe("Dialog component: Focus lock tests", () => {
     const inputs = getAllByRole("textbox");
     const button = getByRole("button");
     expect(document.activeElement).toEqual(inputs[1]);
-    userEvent.tab();
+    const focusGuards = getByRole("dialog").querySelectorAll<HTMLDivElement>(":scope > div[tabindex='0']");
+    expect(focusGuards).toHaveLength(2);
+
+    fireEvent.focus(focusGuards[0]!);
     expect(document.activeElement).toEqual(button);
-    userEvent.tab();
+    fireEvent.focus(focusGuards[1]!);
     expect(document.activeElement).toEqual(inputs[1]);
   });
   test("Focus jumps disabled components and negative tabIndexes when autofocusing first item", () => {
@@ -238,13 +242,16 @@ describe("Dialog component: Focus lock tests", () => {
     const closeAction = getByRole("button");
     const textarea = getByRole("textbox");
     expect(document.activeElement).toEqual(textarea);
-    userEvent.tab();
-    userEvent.tab();
+    const focusGuards = getByRole("dialog").querySelectorAll<HTMLDivElement>(":scope > div[tabindex='0']");
+    expect(focusGuards).toHaveLength(2);
+
+    fireEvent.focus(focusGuards[0]!);
     expect(document.activeElement).toEqual(closeAction);
-    userEvent.tab();
+    fireEvent.focus(focusGuards[1]!);
     expect(document.activeElement).toEqual(textarea);
   });
-  test("'display: none;', 'visibility: hidden;' and 'type = 'hidden'' elements are never autofocused", () => {
+  test("'display: none;', 'visibility: hidden;' and 'type = 'hidden'' elements are never autofocused", async () => {
+    const user = userEvent.setup({ delay: null });
     // TODO: Solve this
     // If we don't have an Onclick function, the Close Icon will be a <div> instead of a <button>, so it won't be focusable.
     const onClick = jest.fn();
@@ -257,10 +264,11 @@ describe("Dialog component: Focus lock tests", () => {
     );
     const closeAction = getByRole("button");
     expect(document.activeElement).toEqual(closeAction);
-    userEvent.tab();
+    await user.tab();
     expect(document.activeElement).toEqual(closeAction);
   });
-  test("Focus gets trapped in the Dialog when there are not focusable elements inside until it is closed", () => {
+  test("Focus gets trapped in the Dialog when there are not focusable elements inside until it is closed", async () => {
+    const user = userEvent.setup({ delay: null });
     const { getAllByRole, getByRole } = render(
       <>
         <DxcTextInput label="Name" />
@@ -273,17 +281,16 @@ describe("Dialog component: Focus lock tests", () => {
     );
     const inputs = getAllByRole("textbox");
     const dialog = getByRole("dialog");
-    userEvent.tab();
-    userEvent.tab();
+    await user.tab();
+    await user.tab();
     expect(document.activeElement).not.toEqual(inputs[1]);
     fireEvent.keyDown(dialog, { key: "Tab", shiftKey: true });
     fireEvent.keyDown(dialog, { key: "Tab", shiftKey: true });
     expect(document.activeElement).not.toEqual(inputs[0]);
   });
-  test("Focus travels correctly in a complex tab sequence", async () => {
-    const onClick = jest.fn();
-    const { getAllByRole, queryByRole, getByRole } = render(
-      <DxcDialog onCloseClick={onClick}>
+  test("Focus guards wrap focus correctly in a complex dialog", () => {
+    const { getAllByRole, getByRole } = render(
+      <DxcDialog onCloseClick={jest.fn()}>
         <DxcSelect label="Accept" options={options} />
         <DxcDateInput label="Older age" />
         <DxcTooltip label="Text input tooltip label">
@@ -302,22 +309,13 @@ describe("Dialog component: Focus lock tests", () => {
     );
     const select = getAllByRole("combobox")[0];
     expect(document.activeElement).toEqual(select);
-    userEvent.keyboard("{ArrowDown}");
-    expect(queryByRole("listbox")).toBeTruthy();
-    userEvent.tab();
-    userEvent.tab();
-    userEvent.tab();
-    await waitFor(() => expect(document.activeElement).toEqual(getByRole("textbox", { name: "Name" })));
-    userEvent.tab();
-    userEvent.tab();
-    expect(document.activeElement).toEqual(getByRole("button", { name: "Cancel" }));
-    userEvent.tab();
-    expect(document.activeElement).toEqual(getByRole("button", { name: "Save" }));
-    userEvent.tab();
-    userEvent.tab();
+    const focusGuards = getByRole("dialog").querySelectorAll<HTMLDivElement>(":scope > div[tabindex='0']");
+    expect(focusGuards).toHaveLength(2);
+
+    fireEvent.focus(focusGuards[1]!);
     expect(document.activeElement).toEqual(select);
-    userEvent.tab({ shift: true });
-    userEvent.tab({ shift: true });
-    expect(getByRole("button", { name: "Save" })).toBeTruthy();
+
+    fireEvent.focus(focusGuards[0]!);
+    expect(document.activeElement).toEqual(getByRole("button", { name: "Close dialog" }));
   });
 });
diff --git a/packages/lib/src/navigation-tree/NavigationTree.test.tsx b/packages/lib/src/navigation-tree/NavigationTree.test.tsx
index 643172d3c..7cdfda216 100644
--- a/packages/lib/src/navigation-tree/NavigationTree.test.tsx
+++ b/packages/lib/src/navigation-tree/NavigationTree.test.tsx
@@ -31,12 +31,13 @@ const groups = [
 ];
 
 describe("Navigation tree component tests", () => {
-  test("Single — Renders with correct aria attributes", () => {
+  test("Single — Renders with correct aria attributes", async () => {
+    const user = userEvent.setup();
     const { getAllByRole, getByRole } = render(<DxcNavigationTree items={items} />);
     expect(getAllByRole("menuitem").length).toBe(4);
     const actions = getAllByRole("button");
     if (actions[0] != null) {
-      userEvent.click(actions[0]);
+      await user.click(actions[0]);
     }
     expect(actions[0]?.getAttribute("aria-pressed")).toBeTruthy();
     expect(getByRole("menu")).toBeTruthy();
@@ -52,39 +53,42 @@ describe("Navigation tree component tests", () => {
     const item = getByRole("button");
     expect(item.getAttribute("aria-pressed")).toBeTruthy();
   });
-  test("Group — Group items collapse when clicked", () => {
+  test("Group — Group items collapse when clicked", async () => {
+    const user = userEvent.setup();
     const { queryByText, getByText } = render(<DxcNavigationTree items={groups} />);
-    userEvent.click(getByText("Grouped Item 1"));
+    await user.click(getByText("Grouped Item 1"));
     expect(getByText("Item 1")).toBeTruthy();
     expect(getByText("Grouped Item 2")).toBeTruthy();
-    userEvent.click(getByText("Grouped Item 2"));
+    await user.click(getByText("Grouped Item 2"));
     expect(getByText("Item 2")).toBeTruthy();
     expect(getByText("Item 3")).toBeTruthy();
-    userEvent.click(getByText("Grouped Item 1"));
+    await user.click(getByText("Grouped Item 1"));
     expect(queryByText("Item 1")).toBeFalsy();
     expect(queryByText("Item 2")).toBeFalsy();
     expect(queryByText("Item 3")).toBeFalsy();
   });
-  test("Group — Renders with correct aria attributes", () => {
+  test("Group — Renders with correct aria attributes", async () => {
+    const user = userEvent.setup();
+
     const { getAllByRole } = render(<DxcNavigationTree items={groups} />);
     const group1 = getAllByRole("button")[0];
     if (group1 != null) {
-      userEvent.click(group1);
+      await user.click(group1);
     }
     expect(group1?.getAttribute("aria-expanded")).toBeTruthy();
     expect(group1?.getAttribute("aria-controls")).toBe(group1?.nextElementSibling?.id);
     const expandedGroupItem1 = getAllByRole("button")[2];
     if (expandedGroupItem1 != null) {
-      userEvent.click(expandedGroupItem1);
+      await user.click(expandedGroupItem1);
     }
     const expandedGroupedItem2 = getAllByRole("button")[6];
     if (expandedGroupedItem2 != null) {
-      userEvent.click(expandedGroupedItem2);
+      await user.click(expandedGroupedItem2);
     }
     expect(getAllByRole("menuitem").length).toBe(10);
     const optionToBeClicked = getAllByRole("button")[4];
     if (optionToBeClicked != null) {
-      userEvent.click(optionToBeClicked);
+      await user.click(optionToBeClicked);
     }
     expect(optionToBeClicked?.getAttribute("aria-pressed")).toBeTruthy();
   });
@@ -99,39 +103,41 @@ describe("Navigation tree component tests", () => {
     expect(getByText("Tested item")).toBeTruthy();
     expect(getAllByRole("button")[1]?.getAttribute("aria-pressed")).toBeTruthy();
   });
-  test("Group — Collapsed groups render as selected when containing a selected item", () => {
+  test("Group — Collapsed groups render as selected when containing a selected item", async () => {
+    const user = userEvent.setup();
     const { getAllByRole } = render(<DxcNavigationTree items={groups} />);
     const group1 = getAllByRole("button")[0];
     if (group1 != null) {
-      userEvent.click(group1);
+      await user.click(group1);
     }
     const group2 = getAllByRole("button")[2];
     if (group2 != null) {
-      userEvent.click(group2);
+      await user.click(group2);
     }
     const item = getAllByRole("button")[3];
     if (item != null) {
-      userEvent.click(item);
+      await user.click(item);
     }
     expect(item?.getAttribute("aria-pressed")).toBeTruthy();
     expect(group1?.getAttribute("aria-pressed")).toBe("false");
     expect(group2?.getAttribute("aria-pressed")).toBe("false");
     if (group2 != null) {
-      userEvent.click(group2);
+      await user.click(group2);
     }
     expect(group2?.getAttribute("aria-pressed")).toBe("true");
     if (group1 != null) {
-      userEvent.click(group1);
+      await user.click(group1);
     }
     expect(group1?.getAttribute("aria-pressed")).toBe("true");
   });
-  test("Sections — Renders with correct aria attributes", () => {
+  test("Sections — Renders with correct aria attributes", async () => {
+    const user = userEvent.setup();
     const { getAllByRole, getByText } = render(<DxcNavigationTree items={sections} />);
     expect(getAllByRole("region").length).toBe(2);
     expect(getAllByRole("menuitem").length).toBe(6);
     const actions = getAllByRole("button");
     if (actions[0] != null) {
-      userEvent.click(actions[0]);
+      await user.click(actions[0]);
     }
     expect(actions[0]?.getAttribute("aria-pressed")).toBeTruthy();
     expect(getAllByRole("menu").length).toBe(2);
diff --git a/packages/lib/src/paginator/Paginator.test.tsx b/packages/lib/src/paginator/Paginator.test.tsx
index 9087431b9..c6ca80404 100644
--- a/packages/lib/src/paginator/Paginator.test.tsx
+++ b/packages/lib/src/paginator/Paginator.test.tsx
@@ -1,5 +1,4 @@
-import { render } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
+import { fireEvent, render } from "@testing-library/react";
 import DxcPaginator from "./Paginator";
 
 global.ResizeObserver = jest.fn().mockImplementation(() => ({
@@ -55,11 +54,11 @@ describe("Paginator component tests", () => {
     );
     const goToPageSelect = getAllByRole("combobox")[0];
     if (goToPageSelect) {
-      userEvent.click(goToPageSelect);
+      fireEvent.click(goToPageSelect);
     }
     const goToPageOption = getByText("2");
     if (goToPageOption) {
-      userEvent.click(goToPageOption);
+      fireEvent.click(goToPageOption);
     }
     expect(onClick).toHaveBeenCalledWith(2);
   });
@@ -71,7 +70,7 @@ describe("Paginator component tests", () => {
     );
     const nextButton = getAllByRole("button")[2];
     if (nextButton) {
-      userEvent.click(nextButton);
+      fireEvent.click(nextButton);
     }
     expect(onClick).toHaveBeenCalled();
   });
@@ -91,11 +90,11 @@ describe("Paginator component tests", () => {
     );
     const select = getAllByText("10")[0];
     if (select) {
-      userEvent.click(select);
+      fireEvent.click(select);
     }
     const itemPerPageOption = getByText("15");
     if (itemPerPageOption) {
-      userEvent.click(itemPerPageOption);
+      fireEvent.click(itemPerPageOption);
     }
     expect(onClick).toHaveBeenCalledWith(15);
   });
@@ -108,7 +107,7 @@ describe("Paginator component tests", () => {
     const nextButton = getAllByRole("button")[2];
     expect(nextButton?.hasAttribute("disabled")).toBeTruthy();
     if (nextButton) {
-      userEvent.click(nextButton);
+      fireEvent.click(nextButton);
     }
     expect(onClick).toHaveBeenCalledTimes(0);
   });
@@ -121,7 +120,7 @@ describe("Paginator component tests", () => {
     const lastButton = getAllByRole("button")[3];
     expect(lastButton?.hasAttribute("disabled")).toBeTruthy();
     if (lastButton) {
-      userEvent.click(lastButton);
+      fireEvent.click(lastButton);
     }
     expect(onClick).toHaveBeenCalledTimes(0);
   });
@@ -134,7 +133,7 @@ describe("Paginator component tests", () => {
     const lastButton = getAllByRole("button")[0];
     expect(lastButton?.hasAttribute("disabled")).toBeTruthy();
     if (lastButton) {
-      userEvent.click(lastButton);
+      fireEvent.click(lastButton);
     }
     expect(onClick).toHaveBeenCalledTimes(0);
   });
@@ -147,7 +146,7 @@ describe("Paginator component tests", () => {
     const lastButton = getAllByRole("button")[1];
     expect(lastButton?.hasAttribute("disabled")).toBeTruthy();
     if (lastButton) {
-      userEvent.click(lastButton);
+      fireEvent.click(lastButton);
     }
     expect(onClick).toHaveBeenCalledTimes(0);
   });
diff --git a/packages/lib/src/toast/Toast.test.tsx b/packages/lib/src/toast/Toast.test.tsx
index 79709a7bc..41fa09578 100644
--- a/packages/lib/src/toast/Toast.test.tsx
+++ b/packages/lib/src/toast/Toast.test.tsx
@@ -47,18 +47,20 @@ const ToastPage = ({ onClick }: { onClick?: () => void }) => {
 
 describe("Toast component tests", () => {
   test("Renders the component", async () => {
+    const user = userEvent.setup();
     const { getByText } = render(
       <DxcToastsQueue>
         <ToastPage />
       </DxcToastsQueue>
     );
     const button = getByText("Show toast");
-    userEvent.click(button);
+    await user.click(button);
     await waitFor(() => {
       expect(getByText("This is a simple toast.")).toBeTruthy();
     });
   });
-  test("Toast disappears after the specified duration", () => {
+  test("Toast disappears after the specified duration", async () => {
+    const user = userEvent.setup();
     jest.useFakeTimers();
     const { getByText, queryByText } = render(
       <DxcToastsQueue duration={4250}>
@@ -66,7 +68,7 @@ describe("Toast component tests", () => {
       </DxcToastsQueue>
     );
     const button = getByText("Show toast");
-    userEvent.click(button);
+    await user.click(button);
 
     act(() => {
       jest.advanceTimersByTime(4249);
@@ -80,7 +82,8 @@ describe("Toast component tests", () => {
 
     jest.useRealTimers();
   });
-  test("If duration > 5000, the toast disappears at 5000ms", () => {
+  test("If duration > 5000, the toast disappears at 5000ms", async () => {
+    const user = userEvent.setup();
     jest.useFakeTimers();
     const { getByText, queryByText } = render(
       <DxcToastsQueue duration={1000000}>
@@ -88,7 +91,7 @@ describe("Toast component tests", () => {
       </DxcToastsQueue>
     );
     const button = getByText("Show toast");
-    userEvent.click(button);
+    await user.click(button);
 
     act(() => {
       jest.advanceTimersByTime(5001);
@@ -97,7 +100,8 @@ describe("Toast component tests", () => {
 
     jest.useRealTimers();
   });
-  test("If duration < 3000, the toast disappears at 3000ms", () => {
+  test("If duration < 3000, the toast disappears at 3000ms", async () => {
+    const user = userEvent.setup();
     jest.useFakeTimers();
     const { getByText, queryByText } = render(
       <DxcToastsQueue duration={100}>
@@ -105,7 +109,7 @@ describe("Toast component tests", () => {
       </DxcToastsQueue>
     );
     const button = getByText("Show toast");
-    userEvent.click(button);
+    await user.click(button);
 
     act(() => {
       jest.advanceTimersByTime(3001);
@@ -115,20 +119,22 @@ describe("Toast component tests", () => {
     jest.useRealTimers();
   });
   test("Clear action removes the toast", async () => {
+    const user = userEvent.setup();
     const { getByText, getByLabelText, queryByText } = render(
       <DxcToastsQueue>
         <ToastPage />
       </DxcToastsQueue>
     );
     const button = getByText("Show toast");
-    userEvent.click(button);
+    await user.click(button);
     const clearButton = getByLabelText("Clear toast");
-    userEvent.click(clearButton);
+    await user.click(clearButton);
     await waitFor(() => {
       expect(queryByText("This is a simple toast.")).toBeFalsy();
     });
   });
-  test("Action button executes the onClick function", () => {
+  test("Action button executes the onClick function", async () => {
+    const user = userEvent.setup();
     const onClick = jest.fn();
     const { getByText } = render(
       <DxcToastsQueue>
@@ -136,12 +142,13 @@ describe("Toast component tests", () => {
       </DxcToastsQueue>
     );
     const button = getByText("Show toast");
-    userEvent.click(button);
+    await user.click(button);
     const actionButton = getByText("Action");
-    userEvent.click(actionButton);
+    await user.click(actionButton);
     expect(onClick).toHaveBeenCalled();
   });
   test("Toast queue can only accumulate 5 toasts at the same time", async () => {
+    const user = userEvent.setup();
     const { getByText, getAllByText } = render(
       <DxcToastsQueue>
         <ToastPage />
@@ -149,13 +156,14 @@ describe("Toast component tests", () => {
     );
     const button = getByText("Show toast");
     for (let i = 0; i < 6; i++) {
-      userEvent.click(button);
+      await user.click(button);
     }
     await waitFor(() => {
       expect(getAllByText("This is a simple toast.").length).toBe(5);
     });
   });
   test("Toast queue removes the older toast when more than 5 toast accumulate", async () => {
+    const user = userEvent.setup();
     const { getByText, getAllByText, queryByText } = render(
       <DxcToastsQueue>
         <ToastPage />
@@ -164,19 +172,20 @@ describe("Toast component tests", () => {
     const infoBtn = getByText("Show info toast");
     const defaultBtn = getByText("Show toast");
 
-    userEvent.click(infoBtn);
+    await user.click(infoBtn);
     await waitFor(() => {
       expect(getByText("This is an information toast.")).toBeTruthy();
     });
     for (let i = 0; i < 6; i++) {
-      userEvent.click(defaultBtn);
+      await user.click(defaultBtn);
     }
     await waitFor(() => {
       expect(queryByText("This is an information toast.")).toBeFalsy();
       expect(getAllByText("This is a simple toast.").length).toBe(5);
     });
   });
-  test("Loading toast is never removed automatically", () => {
+  test("Loading toast is never removed automatically", async () => {
+    const user = userEvent.setup();
     jest.useFakeTimers();
     const { getByText } = render(
       <DxcToastsQueue>
@@ -184,7 +193,7 @@ describe("Toast component tests", () => {
       </DxcToastsQueue>
     );
     const button = getByText("Show loading toast");
-    userEvent.click(button);
+    await user.click(button);
     act(() => {
       jest.advanceTimersByTime(10000); // over 5000ms
     });
@@ -192,20 +201,22 @@ describe("Toast component tests", () => {
     jest.useRealTimers();
   });
   test("Loading toast can be cleared", async () => {
+    const user = userEvent.setup();
     const { getByLabelText, getByText, queryByText } = render(
       <DxcToastsQueue>
         <ToastPage />
       </DxcToastsQueue>
     );
     const button = getByText("Show loading toast");
-    userEvent.click(button);
+    await user.click(button);
     const clearButton = getByLabelText("Clear toast");
-    userEvent.click(clearButton);
+    await user.click(clearButton);
     await waitFor(() => {
       expect(queryByText("Loading...")).toBeFalsy();
     });
   });
   test("Loading toast can be removed programmatically", async () => {
+    const user = userEvent.setup();
     jest.useFakeTimers();
     const { getByText, queryByText } = render(
       <DxcToastsQueue>
@@ -213,7 +224,7 @@ describe("Toast component tests", () => {
       </DxcToastsQueue>
     );
     const button = getByText("Load process");
-    userEvent.click(button);
+    await user.click(button);
     await waitFor(() => {
       expect(getByText("Loading process...")).toBeTruthy();
     });
diff --git a/packages/lib/src/tooltip/Tooltip.test.tsx b/packages/lib/src/tooltip/Tooltip.test.tsx
index 11227c92b..5fa79b4e5 100644
--- a/packages/lib/src/tooltip/Tooltip.test.tsx
+++ b/packages/lib/src/tooltip/Tooltip.test.tsx
@@ -24,26 +24,28 @@ describe("Tooltip component tests", () => {
   });
 
   test("Tooltip renders with correct label on hover", async () => {
+    const user = userEvent.setup();
     const { getByText } = render(
       <DxcTooltip label="Tooltip Test">
         <DxcButton label="Hoverable button" />
       </DxcTooltip>
     );
     const triggerElement = getByText("Hoverable button");
-    userEvent.hover(triggerElement);
+    await user.hover(triggerElement);
     const tooltipElement = await screen.findByRole("tooltip", { name: "Tooltip Test" });
     expect(tooltipElement).toBeInTheDocument();
   });
 
   test("Tooltip stops being rendered when hover is stopped", async () => {
+    const user = userEvent.setup();
     const { getByText, queryByRole } = render(
       <DxcTooltip label="Tooltip Test">
         <DxcButton label="Hoverable button" />
       </DxcTooltip>
     );
     const triggerElement = getByText("Hoverable button");
-    userEvent.hover(triggerElement);
-    userEvent.unhover(triggerElement);
+    await user.hover(triggerElement);
+    await user.unhover(triggerElement);
     await waitFor(() => {
       const tooltipElement = queryByRole("tooltip");
       expect(tooltipElement).toBeFalsy();