diff --git a/packages/core/src/components/EmptyState/EmptyState.test.tsx b/packages/core/src/components/EmptyState/EmptyState.test.tsx
index c5bc7a9876..32e71f044d 100644
--- a/packages/core/src/components/EmptyState/EmptyState.test.tsx
+++ b/packages/core/src/components/EmptyState/EmptyState.test.tsx
@@ -34,6 +34,6 @@ describe('<EmptyState />', () => {
       rendered.getByText('Your plugin is missing an annotation'),
     ).toBeInTheDocument();
     expect(rendered.getByLabelText('button')).toBeInTheDocument();
-    expect(rendered.getByTestId('missingAnnotation')).toBeInTheDocument();
+    expect(rendered.getByAltText('annotation is missing')).toBeInTheDocument();
   });
 });
diff --git a/packages/core/src/components/EmptyState/EmptyStateImage.test.tsx b/packages/core/src/components/EmptyState/EmptyStateImage.test.tsx
index 942f533dac..258eee943d 100644
--- a/packages/core/src/components/EmptyState/EmptyStateImage.test.tsx
+++ b/packages/core/src/components/EmptyState/EmptyStateImage.test.tsx
@@ -20,30 +20,30 @@ import { EmptyStateImage } from './EmptyStateImage';
 
 describe('<EmptyStateImage />', () => {
   it('render EmptyStateImage component with missing field', async () => {
-    const rendered = await renderWithEffects(
+    const { getByAltText } = await renderWithEffects(
       wrapInTestApp(<EmptyStateImage missing="field" />),
     );
-    expect(rendered.getByTestId('missingAnnotation')).toBeInTheDocument();
+    expect(getByAltText('annotation is missing')).toBeInTheDocument();
   });
 
   it('render EmptyStateImage component with missing info', async () => {
-    const rendered = await renderWithEffects(
+    const { getByAltText } = await renderWithEffects(
       wrapInTestApp(<EmptyStateImage missing="info" />),
     );
-    expect(rendered.getByTestId('noInformation')).toBeInTheDocument();
+    expect(getByAltText('no Information')).toBeInTheDocument();
   });
 
   it('render EmptyStateImage component with missing content', async () => {
-    const rendered = await renderWithEffects(
+    const { getByAltText } = await renderWithEffects(
       wrapInTestApp(<EmptyStateImage missing="content" />),
     );
-    expect(rendered.getByTestId('createComponent')).toBeInTheDocument();
+    expect(getByAltText('create Component')).toBeInTheDocument();
   });
 
   it('render EmptyStateImage component with missing data', async () => {
-    const rendered = await renderWithEffects(
+    const { getByAltText } = await renderWithEffects(
       wrapInTestApp(<EmptyStateImage missing="data" />),
     );
-    expect(rendered.getByTestId('noBuild')).toBeInTheDocument();
+    expect(getByAltText('no Build')).toBeInTheDocument();
   });
 });
diff --git a/packages/core/src/components/EmptyState/EmptyStateImage.tsx b/packages/core/src/components/EmptyState/EmptyStateImage.tsx
index c7a61f7190..1973ff9a23 100644
--- a/packages/core/src/components/EmptyState/EmptyStateImage.tsx
+++ b/packages/core/src/components/EmptyState/EmptyStateImage.tsx
@@ -45,7 +45,6 @@ export const EmptyStateImage = ({ missing }: Props) => {
           src={missingAnnotation}
           className={classes.generalImg}
           alt="annotation is missing"
-          data-testid="missingAnnotation"
         />
       );
     case 'info':
@@ -54,7 +53,6 @@ export const EmptyStateImage = ({ missing }: Props) => {
           src={noInformation}
           alt="no Information"
           className={classes.generalImg}
-          data-testid="noInformation"
         />
       );
     case 'content':
@@ -63,17 +61,11 @@ export const EmptyStateImage = ({ missing }: Props) => {
           src={createComponent}
           alt="create Component"
           className={classes.generalImg}
-          data-testid="createComponent"
         />
       );
     case 'data':
       return (
-        <img
-          src={noBuild}
-          alt="no Build"
-          className={classes.generalImg}
-          data-testid="noBuild"
-        />
+        <img src={noBuild} alt="no Build" className={classes.generalImg} />
       );
     default:
       return null;
diff --git a/packages/core/src/components/FeatureDiscovery/FeatureCalloutCircular.test.tsx b/packages/core/src/components/FeatureDiscovery/FeatureCalloutCircular.test.tsx
index 5c7f17ba9f..83a31f198d 100644
--- a/packages/core/src/components/FeatureDiscovery/FeatureCalloutCircular.test.tsx
+++ b/packages/core/src/components/FeatureDiscovery/FeatureCalloutCircular.test.tsx
@@ -136,7 +136,7 @@ describe('<FeatureCalloutCircular />', () => {
         () => UPDATED_BOUNDING_RECT,
       );
 
-      // Trigger the window resize event.
+      // Trigger the window scroll event.
       fireEvent(window, new Event('scroll'));
     });