diff --git a/plugins/catalog/src/components/CatalogFilter/CatalogFilter.test.tsx b/plugins/catalog/src/components/CatalogFilter/CatalogFilter.test.tsx
index 56268697c8..f7143f73a2 100644
--- a/plugins/catalog/src/components/CatalogFilter/CatalogFilter.test.tsx
+++ b/plugins/catalog/src/components/CatalogFilter/CatalogFilter.test.tsx
@@ -131,15 +131,13 @@ describe('Catalog Filter', () => {
     );
 
     for (const key of Object.keys(defaultFilterProps.entitiesByFilter)) {
-      await waitFor(() =>
-        screen.getAllByText(
-          new RegExp(
-            `(${
-              defaultFilterProps.entitiesByFilter[key as EntityGroup].length
-            })`,
-          ),
-        ),
+      const matcher = new RegExp(
+        `(${defaultFilterProps.entitiesByFilter[key as EntityGroup].length})`,
       );
+      await waitFor(() => screen.getAllByText(matcher));
+      screen
+        .getAllByText(matcher)
+        .forEach(el => expect(el).toBeInTheDocument());
     }
   });
 
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
index 8fae75b68b..a11ff8e2a6 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
@@ -85,6 +85,7 @@ describe('CatalogPage', () => {
       ),
     );
     await waitFor(() => screen.getByText(/All Services \(2\)/));
+    expect(screen.getByText(/All Services \(2\)/)).toBeInTheDocument();
   });
   it('should filter by owner', async () => {
     render(
@@ -103,5 +104,6 @@ describe('CatalogPage', () => {
     );
     fireEvent.click(screen.getByText(/Owned/));
     await waitFor(() => screen.getByText(/Owned \(1\)/));
+    expect(screen.getByText(/Owned \(1\)/)).toBeInTheDocument();
   });
 });