diff --git a/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx b/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx
index 17bec9a475..3d99c83966 100644
--- a/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx
+++ b/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx
@@ -194,10 +194,7 @@ describe('<CatalogGraphPage/>', () => {
       },
     );
 
-    expect(await screen.findAllByTestId('node')).toHaveLength(2);
-
-    // We wait a bit here to reliably reproduce an issue where that requires the `baseVal` and `view` mocks
-    await new Promise(r => setTimeout(r, 100));
+    await expect(screen.findAllByTestId('node')).resolves.toHaveLength(2);
 
     await userEvent.click(screen.getByText('b:d/e'));
 
diff --git a/plugins/gocd/src/components/Select/Select.test.tsx b/plugins/gocd/src/components/Select/Select.test.tsx
index 9d73194ed8..c93b5dd148 100644
--- a/plugins/gocd/src/components/Select/Select.test.tsx
+++ b/plugins/gocd/src/components/Select/Select.test.tsx
@@ -66,7 +66,7 @@ describe('Select', () => {
         />,
       );
       user.tab();
-      userEvent.keyboard('{enter}');
+      await userEvent.keyboard('{enter}');
 
       expect(rendered.getAllByText(testItems[0].label)).toHaveLength(2);
       expect(rendered.getByText(testItems[1].label)).toBeInTheDocument();