diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.test.tsx
index 744fe03a0955c..042cd73a763b1 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.test.tsx
@@ -21,47 +21,53 @@ import { render, screen } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
 import Option from 'src/explore/components/controls/DndColumnSelectControl/Option';
 
-test('renders with default props', () => {
+test('renders with default props', async () => {
   const { container } = render(
     <Option index={1} clickClose={jest.fn()}>
       Option
     </Option>,
   );
   expect(container).toBeInTheDocument();
-  expect(screen.getByRole('img', { name: 'x-small' })).toBeInTheDocument();
+  expect(
+    await screen.findByRole('img', { name: 'x-small' }),
+  ).toBeInTheDocument();
   expect(
     screen.queryByRole('img', { name: 'caret-right' }),
   ).not.toBeInTheDocument();
 });
 
-test('renders with caret', () => {
+test('renders with caret', async () => {
   render(
     <Option index={1} clickClose={jest.fn()} withCaret>
       Option
     </Option>,
   );
-  expect(screen.getByRole('img', { name: 'x-small' })).toBeInTheDocument();
-  expect(screen.getByRole('img', { name: 'caret-right' })).toBeInTheDocument();
+  expect(
+    await screen.findByRole('img', { name: 'x-small' }),
+  ).toBeInTheDocument();
+  expect(
+    await screen.findByRole('img', { name: 'caret-right' }),
+  ).toBeInTheDocument();
 });
 
-test('renders with extra triangle', () => {
+test('renders with extra triangle', async () => {
   render(
     <Option index={1} clickClose={jest.fn()} isExtra>
       Option
     </Option>,
   );
   expect(
-    screen.getByRole('button', { name: 'Show info tooltip' }),
+    await screen.findByRole('button', { name: 'Show info tooltip' }),
   ).toBeInTheDocument();
 });
 
-test('triggers onClose', () => {
+test('triggers onClose', async () => {
   const clickClose = jest.fn();
   render(
     <Option index={1} clickClose={clickClose}>
       Option
     </Option>,
   );
-  userEvent.click(screen.getByRole('img', { name: 'x-small' }));
+  userEvent.click(await screen.findByRole('img', { name: 'x-small' }));
   expect(clickClose).toHaveBeenCalled();
 });
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.test.tsx
index e237cea989a5c..d7d362996fe1e 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.test.tsx
@@ -21,7 +21,7 @@ import { render, screen, fireEvent } from 'spec/helpers/testing-library';
 import { DndItemType } from 'src/explore/components/DndItemType';
 import OptionWrapper from 'src/explore/components/controls/DndColumnSelectControl/OptionWrapper';
 
-test('renders with default props', () => {
+test('renders with default props', async () => {
   const { container } = render(
     <OptionWrapper
       index={1}
@@ -33,10 +33,12 @@ test('renders with default props', () => {
     { useDnd: true },
   );
   expect(container).toBeInTheDocument();
-  expect(screen.getByRole('img', { name: 'x-small' })).toBeInTheDocument();
+  expect(
+    await screen.findByRole('img', { name: 'x-small' }),
+  ).toBeInTheDocument();
 });
 
-test('triggers onShiftOptions on drop', () => {
+test('triggers onShiftOptions on drop', async () => {
   const onShiftOptions = jest.fn();
   render(
     <>
@@ -58,7 +60,7 @@ test('triggers onShiftOptions on drop', () => {
     { useDnd: true },
   );
 
-  fireEvent.dragStart(screen.getByText('Option 1'));
-  fireEvent.drop(screen.getByText('Option 2'));
+  fireEvent.dragStart(await screen.findByText('Option 1'));
+  fireEvent.drop(await screen.findByText('Option 2'));
   expect(onShiftOptions).toHaveBeenCalled();
 });