diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/AutoCrudView.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/AutoCrudView.tsx
index e7bf2d7d83..c82d597b45 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/AutoCrudView.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/AutoCrudView.tsx
@@ -2,7 +2,7 @@ import { AutoCrud } from '@vaadin/hilla-react-crud';
 import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
 import { PersonService } from 'Frontend/generated/endpoints.js';
 
-export function AutoCrudView(): JSX.Element {
+export function AutoCrudView(): React.JSX.Element {
   /* page size is defined only to make testing easier */
   return (
     <div className="p-l">
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/AutoFormView.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/AutoFormView.tsx
index d59aeac5ce..8b5f78b6f4 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/AutoFormView.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/AutoFormView.tsx
@@ -4,7 +4,7 @@ import type Appointment from 'Frontend/generated/com/vaadin/hilla/test/reactgrid
 import AppointmentModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/AppointmentModel.js';
 import { AppointmentService } from 'Frontend/generated/endpoints.js';
 
-export function AutoFormView(): JSX.Element {
+export function AutoFormView(): React.JSX.Element {
   const [submitted, setSubmitted] = useState<Appointment | undefined>(undefined);
 
   function handleSubmit({ item }: SubmitEvent<Appointment>) {
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/GridUseDataProviderHookView.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/GridUseDataProviderHookView.tsx
index edad44bbc2..09d04c88a4 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/GridUseDataProviderHookView.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/GridUseDataProviderHookView.tsx
@@ -14,12 +14,12 @@ type GridBodyReactRendererProps<TItem> = {
   item: TItem;
 };
 
-function LuckyNumberRenderer({ item }: GridBodyReactRendererProps<Person>): JSX.Element {
+function LuckyNumberRenderer({ item }: GridBodyReactRendererProps<Person>): React.JSX.Element {
   const value = item.luckyNumber;
   return <span style={{ fontWeight: 'bold', color: value % 2 === 0 ? 'green' : 'red' }}>{value}</span>;
 }
 
-export function GridUseDataProviderHook(): JSX.Element {
+export function GridUseDataProviderHook(): React.JSX.Element {
   const [filter, setFilter] = useState<PropertyStringFilter>();
   const { dataProvider, refresh } = useDataProvider(PersonService, filter);
   const [savedPerson, setSavedPerson] = useState<Person | undefined>(undefined);
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/GridWithEntityReferences.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/GridWithEntityReferences.tsx
index 61e30475b7..a8e5d17c7e 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/GridWithEntityReferences.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/GridWithEntityReferences.tsx
@@ -2,7 +2,7 @@ import { AutoGrid } from '@vaadin/hilla-react-crud';
 import EmployeeModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/entityreferences/EmployeeModel.js';
 import { EmployeeService } from 'Frontend/generated/endpoints.js';
 
-export function GridWithEntityReferences(): JSX.Element {
+export function GridWithEntityReferences(): React.JSX.Element {
   return <AutoGrid pageSize={10} service={EmployeeService} model={EmployeeModel} noHeaderFilters />;
   /* page size is defined only to make testing easier */
 }
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGrid.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGrid.tsx
index f078f034d1..f0e57e74a9 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGrid.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGrid.tsx
@@ -7,12 +7,12 @@ type GridBodyReactRendererProps<TItem> = {
   item: TItem;
 };
 
-function LuckyNumberRenderer({ item }: GridBodyReactRendererProps<Person>): JSX.Element {
+function LuckyNumberRenderer({ item }: GridBodyReactRendererProps<Person>): React.JSX.Element {
   const value = item.luckyNumber;
   return <span style={{ fontWeight: 'bold', color: value % 2 === 0 ? 'green' : 'red' }}>{value}</span>;
 }
 
-export function ReadOnlyGrid(): JSX.Element {
+export function ReadOnlyGrid(): React.JSX.Element {
   return (
     <AutoGrid
       pageSize={10}
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridCustomFilter.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridCustomFilter.tsx
index ff664f03cf..6472ac7902 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridCustomFilter.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridCustomFilter.tsx
@@ -38,7 +38,7 @@ const HeaderFilterRenderer = ({ setFilter }: HeaderFilterRendererProps) => {
   );
 };
 
-const FullNameRenderer = ({ item }: { item: Person }): JSX.Element => (
+const FullNameRenderer = ({ item }: { item: Person }): React.JSX.Element => (
   <span>
     {item.firstName} {item.lastName}
   </span>
@@ -46,7 +46,7 @@ const FullNameRenderer = ({ item }: { item: Person }): JSX.Element => (
 
 const HeaderRenderer = () => <div>Full Name (currently: {new Date().toLocaleString()})</div>;
 
-export function ReadOnlyGridCustomFilter(): JSX.Element {
+export function ReadOnlyGridCustomFilter(): React.JSX.Element {
   return (
     <div>
       <AutoGrid
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridOrFilter.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridOrFilter.tsx
index d9ed2e7a0c..817c843055 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridOrFilter.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridOrFilter.tsx
@@ -5,7 +5,7 @@ import type FilterUnion from 'Frontend/generated/com/vaadin/hilla/crud/filter/Fi
 import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
 import { PersonService } from 'Frontend/generated/endpoints.js';
 
-export function ReadOnlyGridOrFilter(): JSX.Element {
+export function ReadOnlyGridOrFilter(): React.JSX.Element {
   const [filter, setFilter] = useState<FilterUnion | undefined>(undefined);
 
   return (
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridSinglePropertyFilter.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridSinglePropertyFilter.tsx
index 30fb903765..55d9718449 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridSinglePropertyFilter.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridSinglePropertyFilter.tsx
@@ -6,7 +6,7 @@ import Matcher from 'Frontend/generated/com/vaadin/hilla/crud/filter/PropertyStr
 import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
 import { PersonService } from 'Frontend/generated/endpoints.js';
 
-export function ReadOnlyGridSinglePropertyFilter(): JSX.Element {
+export function ReadOnlyGridSinglePropertyFilter(): React.JSX.Element {
   const [filter, setFilter] = useState<FilterUnion | undefined>(undefined);
   return (
     <div>
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridWithHeaderFilter.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridWithHeaderFilter.tsx
index a722b9d412..2036f4bda1 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridWithHeaderFilter.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridWithHeaderFilter.tsx
@@ -6,7 +6,7 @@ import CompanyModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/Com
 import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
 import { CompanyService, PersonService } from 'Frontend/generated/endpoints.js';
 
-export function ReadOnlyGridWithHeaderFilters(): JSX.Element {
+export function ReadOnlyGridWithHeaderFilters(): React.JSX.Element {
   const [model, setModel] = useState<Array<DetachedModelConstructor<AbstractModel>>>([PersonModel]);
   const [service, setService] = useState<CrudService<any>>(PersonService);
   const [noHeaderFilters, setNoHeaderFilters] = useState(false);