diff --git a/assets/js/common/ApiKeySettingsModal/ApiKeySettingsModal.test.jsx b/assets/js/common/ApiKeySettingsModal/ApiKeySettingsModal.test.jsx
index 9a39b840dd..bf708696d7 100644
--- a/assets/js/common/ApiKeySettingsModal/ApiKeySettingsModal.test.jsx
+++ b/assets/js/common/ApiKeySettingsModal/ApiKeySettingsModal.test.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen, act } from '@testing-library/react';
+import { render, screen, act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { faker } from '@faker-js/faker';
 import {
@@ -92,10 +92,10 @@ describe('ApiKeySettingsModal', () => {
       await user.type(screen.getByRole('spinbutton'), '20');
 
       await user.click(screen.getByRole('button', { name: 'months' }));
+      await user.click(screen.getByRole('button', { name: 'months' }));
 
-      await user.click(screen.getByRole('button', { name: 'Generate' }));
 
-      await user.click(screen.getByRole('button', { name: 'Generate' }));
+      await user.click(await waitFor(() => screen.findByText('Generate')));
 
       const [{ apiKeyExpiration: generatedApiKeyExpiration }] =
         onGenerate.mock.lastCall;
diff --git a/assets/js/pages/ChecksCatalog/CheckItem.test.jsx b/assets/js/pages/ChecksCatalog/CheckItem.test.jsx
index 5b26ed807d..963c1735e1 100644
--- a/assets/js/pages/ChecksCatalog/CheckItem.test.jsx
+++ b/assets/js/pages/ChecksCatalog/CheckItem.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 
@@ -67,6 +67,8 @@ describe('ChecksCatalog CheckItem component', () => {
     await user.click(checkDiv);
     expect(screen.getByText(check.remediation)).toBeVisible();
     await user.click(checkDiv);
-    expect(screen.queryByText(check.remediation)).not.toBeInTheDocument();
+    await waitFor(() =>
+      expect(screen.queryByText(check.remediation)).not.toBeInTheDocument()
+    );
   });
 });
diff --git a/assets/js/pages/ChecksCatalog/ChecksCatalog.test.jsx b/assets/js/pages/ChecksCatalog/ChecksCatalog.test.jsx
index 074da03e9e..0dfd5b3657 100644
--- a/assets/js/pages/ChecksCatalog/ChecksCatalog.test.jsx
+++ b/assets/js/pages/ChecksCatalog/ChecksCatalog.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { screen, render } from '@testing-library/react';
+import { screen, render, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
 
@@ -122,12 +122,12 @@ describe('ChecksCatalog ChecksCatalog component', () => {
       await user.click(screen.getByText(filter));
 
       expect(
-        screen.getByText(expectDisabled, { exact: false }).closest('li')
+        screen.getByText(expectDisabled, { exact: false }).closest('div')
       ).toHaveAttribute('aria-disabled', 'true');
 
       const expectItemEnabled = (itemExpectedEnabled) =>
         expect(
-          screen.getByText(itemExpectedEnabled).closest('li')
+          screen.getByText(itemExpectedEnabled).closest('div')
         ).not.toHaveAttribute('aria-disabled');
 
       if (expectEnabled) {
diff --git a/assets/js/pages/Users/UserForm.test.jsx b/assets/js/pages/Users/UserForm.test.jsx
index abdca6a9e2..7b2636f819 100644
--- a/assets/js/pages/Users/UserForm.test.jsx
+++ b/assets/js/pages/Users/UserForm.test.jsx
@@ -301,10 +301,11 @@ describe('UserForm', () => {
 
     await user.click(screen.getByText('Disabled'));
 
-    expect(screen.getAllByText('Enabled')[1].closest('li')).toHaveAttribute(
+    expect(screen.getAllByText('Enabled')[1].closest('div')).toHaveAttribute(
       'aria-disabled',
       'true'
     );
+
     expect(mockOnSave).not.toHaveBeenCalled();
   });
 
diff --git a/assets/js/pages/Users/Users.test.jsx b/assets/js/pages/Users/Users.test.jsx
index fdbe8b3d9e..bf3468f936 100644
--- a/assets/js/pages/Users/Users.test.jsx
+++ b/assets/js/pages/Users/Users.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import '@testing-library/jest-dom';
-import { screen, render } from '@testing-library/react';
+import { screen, render, waitFor } from '@testing-library/react';
 import { adminUser, userFactory } from '@lib/test-utils/factories/users';
 import { renderWithRouter } from '@lib/test-utils';
 import { userEvent } from '@testing-library/user-event';
@@ -44,6 +44,7 @@ describe('Users', () => {
       enabled: true,
       created_at: creationTime[0],
     });
+
     const user = userFactory.build({
       enabled: false,
       created_at: creationTime[1],
@@ -90,10 +91,10 @@ describe('Users', () => {
     expect(screen.getAllByText(user.username)[1]).toBeVisible();
 
     const cancelButton = screen.getByRole('button', { name: /Cancel/i });
-    const modalTitel = screen.getByText(modalHeader);
-    expect(modalTitel).toBeInTheDocument();
+    const modalTitle = screen.getByText(modalHeader);
+    expect(modalTitle).toBeInTheDocument();
     await userEvent.click(cancelButton);
-    expect(modalTitel).not.toBeInTheDocument();
+    await waitFor(() => expect(modalTitle).not.toBeInTheDocument());
   });
 
   describe('Single sign on', () => {