diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
index 3ee610ddaf..c67f5dcddb 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
@@ -154,9 +154,13 @@ describe('<EntityLifecyclePicker/>', () => {
       lifecycles: new EntityLifecycleFilter(['production']),
     });
     fireEvent.click(screen.getByTestId('lifecycle-picker-expand'));
-    expect(screen.getByLabelText('production')).toBeChecked();
+    expect(
+      screen
+        .getByTestId('lifecycle-checkbox-production')
+        .querySelector('input[type="checkbox"]'),
+    ).toBeChecked();
 
-    fireEvent.click(screen.getByLabelText('production'));
+    fireEvent.click(screen.getByTestId('lifecycle-checkbox-label-production'));
     expect(updateFilters).toHaveBeenLastCalledWith({
       lifecycles: undefined,
     });
diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
index 5d1ea0a96c..b1fba50ae8 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
@@ -111,11 +111,12 @@ export const EntityLifecyclePicker = (props: { initialFilter?: string[] }) => {
             setSelectedLifecycles(value)
           }
           renderOption={(option, { selected }) => (
-            <div>
+            <div data-testid={`lifecycle-checkbox-label-${option}`}>
               <Checkbox
                 icon={icon}
                 checkedIcon={checkedIcon}
                 checked={selected}
+                data-testid={`lifecycle-checkbox-${option}`}
               />
               {option}
             </div>
diff --git a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.test.tsx b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.test.tsx
index 00d36e5e13..3970942ee1 100644
--- a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.test.tsx
@@ -123,7 +123,10 @@ describe('<EntityProcessingStatusPicker/>', () => {
     );
 
     fireEvent.click(screen.getByTestId('processing-status-picker-expand'));
-    fireEvent.click(screen.getByText('Is Orphan'));
+
+    fireEvent.click(
+      screen.getByTestId('processing-status-checkbox-label-Is Orphan'),
+    );
     expect(updateFilters).toHaveBeenCalledWith({
       orphan: undefined,
     });
diff --git a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
index 234e86f2fd..237e2d9544 100644
--- a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
@@ -82,7 +82,7 @@ export const EntityProcessingStatusPicker = () => {
             errorChange(value.includes('Has Error'));
           }}
           renderOption={(option, { selected }) => (
-            <div>
+            <div data-testid={`processing-status-checkbox-label-${option}`}>
               <Checkbox
                 icon={icon}
                 checkedIcon={checkedIcon}