diff --git a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx
index cc62b51c98d86..a397d549e0377 100644
--- a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx
+++ b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx
@@ -16,7 +16,10 @@ import {
   GridColDef,
 } from '@mui/x-data-grid-premium';
 
+const isJSDOM = /jsdom/.test(window.navigator.userAgent);
+
 const baselineProps: DataGridPremiumProps = {
+  autoHeight: isJSDOM,
   disableVirtualization: true,
   rows: [
     { id: 0, category1: 'Cat A', category2: 'Cat 1' },
diff --git a/packages/x-data-grid-pro/src/tests/rows.DataGridPro.test.tsx b/packages/x-data-grid-pro/src/tests/rows.DataGridPro.test.tsx
index 56a1d9bb50965..65c330b204485 100644
--- a/packages/x-data-grid-pro/src/tests/rows.DataGridPro.test.tsx
+++ b/packages/x-data-grid-pro/src/tests/rows.DataGridPro.test.tsx
@@ -470,7 +470,7 @@ describe('<DataGridPro /> - Rows', () => {
     });
 
     it('should have all the rows rendered in the DOM when autoPageSize: true', () => {
-      render(<TestCaseVirtualization />);
+      render(<TestCaseVirtualization autoHeight />);
       expect(getRows()).to.have.length(apiRef.current.state.pagination.paginationModel.pageSize);
     });
 
diff --git a/packages/x-data-grid/src/tests/columnSpanning.DataGrid.test.tsx b/packages/x-data-grid/src/tests/columnSpanning.DataGrid.test.tsx
index 211f8b8d74b9b..e6c57a4af7c62 100644
--- a/packages/x-data-grid/src/tests/columnSpanning.DataGrid.test.tsx
+++ b/packages/x-data-grid/src/tests/columnSpanning.DataGrid.test.tsx
@@ -178,7 +178,12 @@ describe('<DataGrid /> - Column spanning', () => {
     it('should move down by the amount of rows visible on screen when pressing "PageDown"', () => {
       render(
         <div style={{ width: 500, height: 300 }}>
-          <DataGrid {...baselineProps} columns={columns} disableVirtualization={isJSDOM} />
+          <DataGrid
+            {...baselineProps}
+            columns={columns}
+            autoHeight={isJSDOM}
+            disableVirtualization={isJSDOM}
+          />
         </div>,
       );
 
@@ -192,7 +197,7 @@ describe('<DataGrid /> - Column spanning', () => {
     it('should move up by the amount of rows visible on screen when pressing "PageUp"', () => {
       render(
         <div style={{ width: 500, height: 300 }}>
-          <DataGrid {...baselineProps} columns={columns} />
+          <DataGrid {...baselineProps} columns={columns} autoHeight={isJSDOM} />
         </div>,
       );