diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
index 858479f9bc..bc0a5ed32d 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
@@ -18,11 +18,12 @@ import { CATALOG_FILTER_EXISTS } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
 import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
-import { FieldProps } from '@rjsf/utils';
+
 import { fireEvent, screen } from '@testing-library/react';
 import React from 'react';
 import { MultiEntityPicker } from './MultiEntityPicker';
 import { MultiEntityPickerProps } from './schema';
+import { ScaffolderRJSFFieldProps as FieldProps } from '@backstage/plugin-scaffolder-react';
 
 const makeEntity = (kind: string, namespace: string, name: string): Entity => ({
   apiVersion: 'scaffolder.backstage.io/v1beta3',
@@ -39,7 +40,7 @@ describe('<MultiEntityPicker />', () => {
   const rawErrors: string[] = [];
   const formData: string[] = [];
 
-  let props: FieldProps;
+  let props: FieldProps<string[]>;
 
   const catalogApi: jest.Mocked<CatalogApi> = {
     getLocationById: jest.fn(),
@@ -64,7 +65,7 @@ describe('<MultiEntityPicker />', () => {
     );
   });
 
-  // afterEach(() => jest.resetAllMocks());
+  afterEach(() => jest.resetAllMocks());
 
   describe('without allowedKinds and catalogFilter', () => {
     beforeEach(() => {
@@ -76,7 +77,7 @@ describe('<MultiEntityPicker />', () => {
         uiSchema,
         rawErrors,
         formData,
-      } as unknown as FieldProps<any>;
+      } as unknown as FieldProps;
 
       catalogApi.getEntities.mockResolvedValue({ items: entities });
     });