diff --git a/packages/material-ui-lab/src/CalendarPicker/CalendarPicker.test.tsx b/packages/material-ui-lab/src/CalendarPicker/CalendarPicker.test.tsx
index 6165a237da0c10..219c8eae494a3b 100644
--- a/packages/material-ui-lab/src/CalendarPicker/CalendarPicker.test.tsx
+++ b/packages/material-ui-lab/src/CalendarPicker/CalendarPicker.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { SinonFakeTimers, useFakeTimers } from 'sinon';
-import { fireEvent, screen, describeConformanceV5 } from 'test/utils';
+import { fireEvent, screen, describeConformance } from 'test/utils';
 import CalendarPicker, { calendarPickerClasses as classes } from '@material-ui/lab/CalendarPicker';
 import {
   adapterToUse,
@@ -21,7 +21,7 @@ describe('<CalendarPicker />', () => {
 
   const render = createPickerRender();
 
-  describeConformanceV5(<CalendarPicker date={adapterToUse.date()} onChange={() => {}} />, () => ({
+  describeConformance(<CalendarPicker date={adapterToUse.date()} onChange={() => {}} />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui-lab/src/CalendarPickerSkeleton/CalendarPickerSkeleton.test.tsx b/packages/material-ui-lab/src/CalendarPickerSkeleton/CalendarPickerSkeleton.test.tsx
index 78bcb5a7f98787..a2b440d99af8e5 100644
--- a/packages/material-ui-lab/src/CalendarPickerSkeleton/CalendarPickerSkeleton.test.tsx
+++ b/packages/material-ui-lab/src/CalendarPickerSkeleton/CalendarPickerSkeleton.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import CalendarPickerSkeleton, {
   calendarPickerSkeletonClasses as classes,
 } from '@material-ui/lab/CalendarPickerSkeleton';
@@ -7,7 +7,7 @@ import CalendarPickerSkeleton, {
 describe('<CalendarPickerSkeleton />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<CalendarPickerSkeleton />, () => ({
+  describeConformance(<CalendarPickerSkeleton />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui-lab/src/ClockPicker/ClockPicker.test.tsx b/packages/material-ui-lab/src/ClockPicker/ClockPicker.test.tsx
index ddb20495b62d1e..d8256c72a59961 100644
--- a/packages/material-ui-lab/src/ClockPicker/ClockPicker.test.tsx
+++ b/packages/material-ui-lab/src/ClockPicker/ClockPicker.test.tsx
@@ -1,13 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import {
-  describeConformanceV5,
-  fireEvent,
-  fireTouchChangedEvent,
-  screen,
-  within,
-} from 'test/utils';
+import { describeConformance, fireEvent, fireTouchChangedEvent, screen, within } from 'test/utils';
 import ClockPicker, { clockPickerClasses as classes } from '@material-ui/lab/ClockPicker';
 import {
   adapterToUse,
@@ -19,7 +13,7 @@ import {
 describe('<ClockPicker />', () => {
   const render = createPickerRender();
 
-  describeConformanceV5(
+  describeConformance(
     <ClockPicker date={adapterToUse.date()} showViewSwitcher onChange={() => {}} />,
     () => ({
       classes,
diff --git a/packages/material-ui-lab/src/DateRangePicker/DateRangePicker.test.tsx b/packages/material-ui-lab/src/DateRangePicker/DateRangePicker.test.tsx
index a00eab3cbdc552..748154b8912b67 100644
--- a/packages/material-ui-lab/src/DateRangePicker/DateRangePicker.test.tsx
+++ b/packages/material-ui-lab/src/DateRangePicker/DateRangePicker.test.tsx
@@ -15,9 +15,20 @@ describe('<DateRangePicker />', () => {
     />,
     () => ({
       classes: {},
+      muiName: 'MuiDateRangePicker',
       wrapMount: wrapPickerMount,
       refInstanceof: window.HTMLDivElement,
-      skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
+      skip: [
+        'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
+        'mergeClassName',
+        'propsSpread',
+        'rootClass',
+        'reactTestRenderer',
+      ],
     }),
   );
 
diff --git a/packages/material-ui-lab/src/DateRangePickerDay/DateRangePickerDay.test.tsx b/packages/material-ui-lab/src/DateRangePickerDay/DateRangePickerDay.test.tsx
index c3bc3d250b4aba..ea8ef9d27bcf5f 100644
--- a/packages/material-ui-lab/src/DateRangePickerDay/DateRangePickerDay.test.tsx
+++ b/packages/material-ui-lab/src/DateRangePickerDay/DateRangePickerDay.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { describeConformanceV5 } from 'test/utils';
+import { describeConformance } from 'test/utils';
 import DateRangePickerDay, {
   dateRangePickerDayClasses as classes,
 } from '@material-ui/lab/DateRangePickerDay';
@@ -8,7 +8,7 @@ import { adapterToUse, wrapPickerMount, createPickerRender } from '../internal/p
 describe('<DateRangePickerDay />', () => {
   const render = createPickerRender();
 
-  describeConformanceV5(
+  describeConformance(
     <DateRangePickerDay
       day={adapterToUse.date()}
       outsideCurrentMonth={false}
diff --git a/packages/material-ui-lab/src/DesktopDateRangePicker/DesktopDateRangePicker.test.tsx b/packages/material-ui-lab/src/DesktopDateRangePicker/DesktopDateRangePicker.test.tsx
index 8633e96b50fc8c..db634f3f2ac4d0 100644
--- a/packages/material-ui-lab/src/DesktopDateRangePicker/DesktopDateRangePicker.test.tsx
+++ b/packages/material-ui-lab/src/DesktopDateRangePicker/DesktopDateRangePicker.test.tsx
@@ -40,9 +40,20 @@ describe('<DesktopDateRangePicker />', () => {
     />,
     () => ({
       classes: {},
+      muiName: 'MuiDesktopDateRangePicker',
       wrapMount: wrapPickerMount,
       refInstanceof: window.HTMLDivElement,
-      skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
+      skip: [
+        'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
+        'mergeClassName',
+        'propsSpread',
+        'rootClass',
+        'reactTestRenderer',
+      ],
     }),
   );
 
@@ -341,7 +352,7 @@ describe('<DesktopDateRangePicker />', () => {
     expect(screen.getByRole('tooltip')).toBeVisible();
   });
 
-  // TODO: remove once we use describeConformanceV5.
+  // TODO: remove once we use describeConformance.
   it("respect theme's defaultProps", () => {
     const theme = createTheme({
       components: {
diff --git a/packages/material-ui-lab/src/DesktopTimePicker/DesktopTimePicker.test.tsx b/packages/material-ui-lab/src/DesktopTimePicker/DesktopTimePicker.test.tsx
index 7b93d9534eb1bf..8df93020a78c8a 100644
--- a/packages/material-ui-lab/src/DesktopTimePicker/DesktopTimePicker.test.tsx
+++ b/packages/material-ui-lab/src/DesktopTimePicker/DesktopTimePicker.test.tsx
@@ -28,9 +28,20 @@ describe('<DesktopTimePicker />', () => {
     />,
     () => ({
       classes: {},
+      muiName: 'MuiDesktopTimePicker',
       wrapMount: wrapPickerMount,
       refInstanceof: window.HTMLDivElement,
-      skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
+      skip: [
+        'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
+        'mergeClassName',
+        'propsSpread',
+        'rootClass',
+        'reactTestRenderer',
+      ],
     }),
   );
 
diff --git a/packages/material-ui-lab/src/LoadingButton/LoadingButton.test.js b/packages/material-ui-lab/src/LoadingButton/LoadingButton.test.js
index a38db096a71fc0..6063bd55b5bfaf 100644
--- a/packages/material-ui-lab/src/LoadingButton/LoadingButton.test.js
+++ b/packages/material-ui-lab/src/LoadingButton/LoadingButton.test.js
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5, screen } from 'test/utils';
+import { createClientRender, describeConformance, screen } from 'test/utils';
 import { expect } from 'chai';
 import Button from '@material-ui/core/Button';
 import LoadingButton, { loadingButtonClasses as classes } from '@material-ui/lab/LoadingButton';
@@ -7,7 +7,7 @@ import LoadingButton, { loadingButtonClasses as classes } from '@material-ui/lab
 describe('<LoadingButton />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<LoadingButton>Conformance?</LoadingButton>, () => ({
+  describeConformance(<LoadingButton>Conformance?</LoadingButton>, () => ({
     classes,
     inheritComponent: Button,
     render,
diff --git a/packages/material-ui-lab/src/MobileDateRangePicker/MobileDateRangePicker.test.tsx b/packages/material-ui-lab/src/MobileDateRangePicker/MobileDateRangePicker.test.tsx
index e087309efe7f15..063d0f2a773421 100644
--- a/packages/material-ui-lab/src/MobileDateRangePicker/MobileDateRangePicker.test.tsx
+++ b/packages/material-ui-lab/src/MobileDateRangePicker/MobileDateRangePicker.test.tsx
@@ -15,9 +15,20 @@ describe('<MobileDateRangePicker />', () => {
     />,
     () => ({
       classes: {},
+      muiName: 'MuiMobileDateRangePicker',
       wrapMount: wrapPickerMount,
       refInstanceof: window.HTMLDivElement,
-      skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
+      skip: [
+        'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
+        'mergeClassName',
+        'propsSpread',
+        'rootClass',
+        'reactTestRenderer',
+      ],
     }),
   );
 
diff --git a/packages/material-ui-lab/src/MobileTimePicker/MobileTimePicker.test.tsx b/packages/material-ui-lab/src/MobileTimePicker/MobileTimePicker.test.tsx
index 5c433ebb5c7bd5..2037d3c536433c 100644
--- a/packages/material-ui-lab/src/MobileTimePicker/MobileTimePicker.test.tsx
+++ b/packages/material-ui-lab/src/MobileTimePicker/MobileTimePicker.test.tsx
@@ -38,9 +38,20 @@ describe('<MobileTimePicker />', () => {
     />,
     () => ({
       classes: {},
+      muiName: 'MuiMobileTimePicker',
       wrapMount: wrapPickerMount,
       refInstanceof: window.HTMLDivElement,
-      skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
+      skip: [
+        'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
+        'mergeClassName',
+        'propsSpread',
+        'rootClass',
+        'reactTestRenderer',
+      ],
     }),
   );
 
diff --git a/packages/material-ui-lab/src/MonthPicker/MonthPicker.test.tsx b/packages/material-ui-lab/src/MonthPicker/MonthPicker.test.tsx
index 14b9f4be76d503..8fbe815a15e847 100644
--- a/packages/material-ui-lab/src/MonthPicker/MonthPicker.test.tsx
+++ b/packages/material-ui-lab/src/MonthPicker/MonthPicker.test.tsx
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { spy } from 'sinon';
 import { expect } from 'chai';
-import { fireEvent, screen, describeConformanceV5 } from 'test/utils';
+import { fireEvent, screen, describeConformance } from 'test/utils';
 import MonthPicker, { monthPickerClasses as classes } from '@material-ui/lab/MonthPicker';
 import { adapterToUse, wrapPickerMount, createPickerRender } from '../internal/pickers/test-utils';
 
 describe('<MonthPicker />', () => {
   const render = createPickerRender();
 
-  describeConformanceV5(
+  describeConformance(
     <MonthPicker
       minDate={adapterToUse.date('2019-01-01T00:00:00.000')}
       maxDate={adapterToUse.date('2029-01-01T00:00:00.000')}
diff --git a/packages/material-ui-lab/src/PickersDay/PickersDay.test.tsx b/packages/material-ui-lab/src/PickersDay/PickersDay.test.tsx
index 6b62c0323db426..91e9e8a10d1ec4 100644
--- a/packages/material-ui-lab/src/PickersDay/PickersDay.test.tsx
+++ b/packages/material-ui-lab/src/PickersDay/PickersDay.test.tsx
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, fireEvent, screen } from 'test/utils';
+import { describeConformance, fireEvent, screen } from 'test/utils';
 import PickersDay, { pickersDayClasses as classes } from '@material-ui/lab/PickersDay';
 import { adapterToUse, wrapPickerMount, createPickerRender } from '../internal/pickers/test-utils';
 
 describe('<PickersDay />', () => {
   const render = createPickerRender();
 
-  describeConformanceV5(
+  describeConformance(
     <PickersDay
       day={adapterToUse.date()}
       outsideCurrentMonth={false}
diff --git a/packages/material-ui-lab/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx b/packages/material-ui-lab/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx
index f0186287f72889..622589216ccaf2 100644
--- a/packages/material-ui-lab/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx
+++ b/packages/material-ui-lab/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx
@@ -38,10 +38,15 @@ describe('<StaticDateRangePicker />', () => {
     />,
     () => ({
       classes: {},
+      muiName: 'MuiStaticDateRangePicker',
       wrapMount: wrapPickerMount,
       refInstanceof: undefined,
       skip: [
         'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
         'mergeClassName',
         'propsSpread',
         'refForwarding',
diff --git a/packages/material-ui-lab/src/StaticTimePicker/StaticTimePicker.test.tsx b/packages/material-ui-lab/src/StaticTimePicker/StaticTimePicker.test.tsx
index 214453f0c43247..664dc5557e2328 100644
--- a/packages/material-ui-lab/src/StaticTimePicker/StaticTimePicker.test.tsx
+++ b/packages/material-ui-lab/src/StaticTimePicker/StaticTimePicker.test.tsx
@@ -13,10 +13,15 @@ describe('<StaticTimePicker />', () => {
     />,
     () => ({
       classes: {},
+      muiName: 'MuiStaticTimePicker',
       wrapMount: wrapPickerMount,
       refInstanceof: undefined,
       skip: [
         'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
         'mergeClassName',
         'propsSpread',
         // TODO: `ref` is typed but has no effect
diff --git a/packages/material-ui-lab/src/TabList/TabList.test.js b/packages/material-ui-lab/src/TabList/TabList.test.js
index 857dce9d228ee3..6865229ddd802d 100644
--- a/packages/material-ui-lab/src/TabList/TabList.test.js
+++ b/packages/material-ui-lab/src/TabList/TabList.test.js
@@ -10,8 +10,8 @@ import TabContext from '../TabContext';
 describe('<TabList />', () => {
   const render = createClientRender();
 
+  // @ts-ignore mui name does not exist for this component
   describeConformance(<TabList />, () => ({
-    // @ts-expect-error https://github.com/microsoft/TypeScript/issues/15300
     classes,
     inheritComponent: Tabs,
     /**
@@ -24,7 +24,14 @@ describe('<TabList />', () => {
     },
     refInstanceof: window.HTMLDivElement,
     // TODO: no idea why reactTestRenderer fails
-    skip: ['reactTestRenderer'],
+    skip: [
+      'componentsProp',
+      'themeDefaultProps',
+      'themeStyleOverrides',
+      'themeVariants',
+      'rootClass',
+      'reactTestRenderer',
+    ],
   }));
 
   // outside of TabContext pass every test in Tabs
diff --git a/packages/material-ui-lab/src/TabPanel/TabPanel.test.tsx b/packages/material-ui-lab/src/TabPanel/TabPanel.test.tsx
index 886da2972e66b8..c7162b53fee51c 100644
--- a/packages/material-ui-lab/src/TabPanel/TabPanel.test.tsx
+++ b/packages/material-ui-lab/src/TabPanel/TabPanel.test.tsx
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TabPanel, { tabPanelClasses as classes } from '@material-ui/lab/TabPanel';
 import TabContext from '../TabContext';
 
 describe('<TabPanel />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TabPanel value="0" />, () => ({
+  describeConformance(<TabPanel value="0" />, () => ({
     classes,
     inheritComponent: 'div',
     render: (node) => render(<TabContext value="0">{node}</TabContext>),
diff --git a/packages/material-ui-lab/src/TimePicker/TimePicker.test.tsx b/packages/material-ui-lab/src/TimePicker/TimePicker.test.tsx
index 1f0120fb930fa4..a6df91340c9130 100644
--- a/packages/material-ui-lab/src/TimePicker/TimePicker.test.tsx
+++ b/packages/material-ui-lab/src/TimePicker/TimePicker.test.tsx
@@ -13,9 +13,20 @@ describe('<TimePicker />', () => {
     />,
     () => ({
       classes: {},
+      muiName: 'MuiTimePicker',
       wrapMount: wrapPickerMount,
       refInstanceof: window.HTMLDivElement,
-      skip: ['componentProp', 'mergeClassName', 'propsSpread', 'rootClass', 'reactTestRenderer'],
+      skip: [
+        'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
+        'mergeClassName',
+        'propsSpread',
+        'rootClass',
+        'reactTestRenderer',
+      ],
     }),
   );
 });
diff --git a/packages/material-ui-lab/src/Timeline/Timeline.test.tsx b/packages/material-ui-lab/src/Timeline/Timeline.test.tsx
index 4ea8fa3710ffe1..3bda3af9e69de9 100644
--- a/packages/material-ui-lab/src/Timeline/Timeline.test.tsx
+++ b/packages/material-ui-lab/src/Timeline/Timeline.test.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Timeline, { timelineClasses as classes } from '@material-ui/lab/Timeline';
 
 describe('<Timeline />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Timeline />, () => ({
+  describeConformance(<Timeline />, () => ({
     classes,
     inheritComponent: 'ul',
     render,
diff --git a/packages/material-ui-lab/src/TimelineConnector/TimelineConnector.test.js b/packages/material-ui-lab/src/TimelineConnector/TimelineConnector.test.js
index 1684c68a479fd8..5fd2c86b41c973 100644
--- a/packages/material-ui-lab/src/TimelineConnector/TimelineConnector.test.js
+++ b/packages/material-ui-lab/src/TimelineConnector/TimelineConnector.test.js
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TimelineConnector, {
   timelineConnectorClasses as classes,
 } from '@material-ui/lab/TimelineConnector';
@@ -7,7 +7,7 @@ import TimelineConnector, {
 describe('<TimelineConnector />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TimelineConnector />, () => ({
+  describeConformance(<TimelineConnector />, () => ({
     classes,
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui-lab/src/TimelineContent/TimelineContent.test.js b/packages/material-ui-lab/src/TimelineContent/TimelineContent.test.js
index e8c922dd997527..b1752db117dafc 100644
--- a/packages/material-ui-lab/src/TimelineContent/TimelineContent.test.js
+++ b/packages/material-ui-lab/src/TimelineContent/TimelineContent.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Typography from '@material-ui/core/Typography';
 import Timeline from '@material-ui/lab/Timeline';
 import TimelineItem from '@material-ui/lab/TimelineItem';
@@ -11,7 +11,7 @@ import TimelineContent, {
 describe('<TimelineContent />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TimelineContent />, () => ({
+  describeConformance(<TimelineContent />, () => ({
     classes,
     inheritComponent: Typography,
     render,
diff --git a/packages/material-ui-lab/src/TimelineDot/TimelineDot.test.js b/packages/material-ui-lab/src/TimelineDot/TimelineDot.test.js
index f85a08a7f7f283..b2db0aa9fd81e6 100644
--- a/packages/material-ui-lab/src/TimelineDot/TimelineDot.test.js
+++ b/packages/material-ui-lab/src/TimelineDot/TimelineDot.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TimelineDot, { timelineDotClasses as classes } from '@material-ui/lab/TimelineDot';
 
 describe('<TimelineDot />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TimelineDot />, () => ({
+  describeConformance(<TimelineDot />, () => ({
     classes,
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui-lab/src/TimelineItem/TimelineItem.test.js b/packages/material-ui-lab/src/TimelineItem/TimelineItem.test.js
index 0d53fc833e0d46..5a7a75401d2724 100644
--- a/packages/material-ui-lab/src/TimelineItem/TimelineItem.test.js
+++ b/packages/material-ui-lab/src/TimelineItem/TimelineItem.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TimelineItem, { timelineItemClasses as classes } from '@material-ui/lab/TimelineItem';
 
 describe('<TimelineItem />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TimelineItem />, () => ({
+  describeConformance(<TimelineItem />, () => ({
     classes,
     inheritComponent: 'li',
     render,
diff --git a/packages/material-ui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js b/packages/material-ui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js
index 006bda22e57daa..3eb2fd96a2bbe9 100644
--- a/packages/material-ui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js
+++ b/packages/material-ui-lab/src/TimelineOppositeContent/TimelineOppositeContent.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Typography from '@material-ui/core/Typography';
 import Timeline from '@material-ui/lab/Timeline';
 import TimelineItem from '@material-ui/lab/TimelineItem';
@@ -11,7 +11,7 @@ import TimelineOppositeContent, {
 describe('<TimelineOppositeContent />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TimelineOppositeContent />, () => ({
+  describeConformance(<TimelineOppositeContent />, () => ({
     classes,
     inheritComponent: Typography,
     render,
diff --git a/packages/material-ui-lab/src/TimelineSeparator/TimelineSeparator.test.js b/packages/material-ui-lab/src/TimelineSeparator/TimelineSeparator.test.js
index 5424ac47d3cf31..8aeb238352c62f 100644
--- a/packages/material-ui-lab/src/TimelineSeparator/TimelineSeparator.test.js
+++ b/packages/material-ui-lab/src/TimelineSeparator/TimelineSeparator.test.js
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TimelineSeparator, {
   timelineSeparatorClasses as classes,
 } from '@material-ui/lab/TimelineSeparator';
@@ -7,7 +7,7 @@ import TimelineSeparator, {
 describe('<TimelineSeparator />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TimelineSeparator />, () => ({
+  describeConformance(<TimelineSeparator />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui-lab/src/TreeItem/TreeItem.test.js b/packages/material-ui-lab/src/TreeItem/TreeItem.test.js
index 163e778da7d146..ba65e7ecb89d41 100644
--- a/packages/material-ui-lab/src/TreeItem/TreeItem.test.js
+++ b/packages/material-ui-lab/src/TreeItem/TreeItem.test.js
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import PropTypes from 'prop-types';
 import { spy } from 'sinon';
 import {
-  describeConformanceV5,
+  describeConformance,
   act,
   createEvent,
   createClientRender,
@@ -16,7 +16,7 @@ import TreeItem, { treeItemClasses as classes } from '@material-ui/lab/TreeItem'
 describe('<TreeItem />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TreeItem nodeId="one" label="one" />, () => ({
+  describeConformance(<TreeItem nodeId="one" label="one" />, () => ({
     classes,
     inheritComponent: 'li',
     render,
diff --git a/packages/material-ui-lab/src/TreeView/TreeView.test.js b/packages/material-ui-lab/src/TreeView/TreeView.test.js
index 129d8a281a4ca5..83e3472c670f2a 100644
--- a/packages/material-ui-lab/src/TreeView/TreeView.test.js
+++ b/packages/material-ui-lab/src/TreeView/TreeView.test.js
@@ -7,7 +7,7 @@ import {
   ErrorBoundary,
   fireEvent,
   screen,
-  describeConformanceV5,
+  describeConformance,
 } from 'test/utils';
 import Portal from '@material-ui/core/Portal';
 import TreeView, { treeViewClasses as classes } from '@material-ui/lab/TreeView';
@@ -16,7 +16,7 @@ import TreeItem from '@material-ui/lab/TreeItem';
 describe('<TreeView />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TreeView />, () => ({
+  describeConformance(<TreeView />, () => ({
     classes,
     inheritComponent: 'ul',
     render,
diff --git a/packages/material-ui-lab/src/YearPicker/YearPicker.test.tsx b/packages/material-ui-lab/src/YearPicker/YearPicker.test.tsx
index 2886183bdb5c01..d1b86a0582f2d6 100644
--- a/packages/material-ui-lab/src/YearPicker/YearPicker.test.tsx
+++ b/packages/material-ui-lab/src/YearPicker/YearPicker.test.tsx
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { spy } from 'sinon';
 import { expect } from 'chai';
-import { fireEvent, screen, describeConformanceV5 } from 'test/utils';
+import { fireEvent, screen, describeConformance } from 'test/utils';
 import YearPicker, { yearPickerClasses as classes } from '@material-ui/lab/YearPicker';
 import { adapterToUse, wrapPickerMount, createPickerRender } from '../internal/pickers/test-utils';
 
 describe('<YearPicker />', () => {
   const render = createPickerRender();
 
-  describeConformanceV5(
+  describeConformance(
     <YearPicker
       minDate={adapterToUse.date('2019-01-01T00:00:00.000')}
       maxDate={adapterToUse.date('2029-01-01T00:00:00.000')}
diff --git a/packages/material-ui-system/src/Box/Box.test.js b/packages/material-ui-system/src/Box/Box.test.js
index 06c34106caf355..4d94486e79e27e 100644
--- a/packages/material-ui-system/src/Box/Box.test.js
+++ b/packages/material-ui-system/src/Box/Box.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Box from '@material-ui/core/Box';
 
 describe('<Box />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Box />, () => ({
+  describeConformance(<Box />, () => ({
     render,
     inheritComponent: 'div',
     skip: [
diff --git a/packages/material-ui-unstyled/src/BackdropUnstyled/BackdropUnstyled.test.js b/packages/material-ui-unstyled/src/BackdropUnstyled/BackdropUnstyled.test.js
index 6b38b3cd24ad69..9555bba82ea194 100644
--- a/packages/material-ui-unstyled/src/BackdropUnstyled/BackdropUnstyled.test.js
+++ b/packages/material-ui-unstyled/src/BackdropUnstyled/BackdropUnstyled.test.js
@@ -18,6 +18,11 @@ describe('<BackdropUnstyled />', () => {
       render,
       refInstanceof: window.HTMLDivElement,
       testComponentPropWith: 'div',
+      skip: [
+        'themeDefaultProps', // unstyled
+        'themeStyleOverrides', // unstyled
+        'themeVariants', // unstyled
+      ],
     }),
   );
 
diff --git a/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.test.js b/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.test.js
index f846cfa789a491..ec2a5c20198bf0 100644
--- a/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.test.js
+++ b/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.test.js
@@ -18,6 +18,11 @@ describe('<BadgeUnstyled />', () => {
       render,
       refInstanceof: window.HTMLSpanElement,
       testComponentPropWith: 'div',
+      skip: [
+        'themeDefaultProps', // unstyled
+        'themeStyleOverrides', // unstyled
+        'themeVariants', // unstyled
+      ],
     }),
   );
 
diff --git a/packages/material-ui-unstyled/src/ModalUnstyled/ModalUnstyled.test.js b/packages/material-ui-unstyled/src/ModalUnstyled/ModalUnstyled.test.js
index 768b53db4fd43d..d8763f43ee05d0 100644
--- a/packages/material-ui-unstyled/src/ModalUnstyled/ModalUnstyled.test.js
+++ b/packages/material-ui-unstyled/src/ModalUnstyled/ModalUnstyled.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import ModalUnstyled, {
   modalUnstyledClasses as classes,
 } from '@material-ui/unstyled/ModalUnstyled';
@@ -17,7 +17,7 @@ describe('<ModalUnstyled />', () => {
     document.body.setAttribute('style', savedBodyStyle);
   });
 
-  describeConformanceV5(
+  describeConformance(
     <ModalUnstyled open>
       <div />
     </ModalUnstyled>,
diff --git a/packages/material-ui-unstyled/src/SliderUnstyled/SliderUnstyled.test.js b/packages/material-ui-unstyled/src/SliderUnstyled/SliderUnstyled.test.js
index 381fa98bd75dae..756615c2f2f4ac 100644
--- a/packages/material-ui-unstyled/src/SliderUnstyled/SliderUnstyled.test.js
+++ b/packages/material-ui-unstyled/src/SliderUnstyled/SliderUnstyled.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformance, screen } from 'test/utils';
+import { createClientRender, createMount, describeConformance, screen } from 'test/utils';
 import SliderUnstyled, {
   sliderUnstyledClasses as classes,
 } from '@material-ui/unstyled/SliderUnstyled';
@@ -12,14 +12,21 @@ describe('<SliderUnstyled />', () => {
     }
   });
 
+  const mount = createMount();
   const render = createClientRender();
 
   describeConformance(<SliderUnstyled value={0} />, () => ({
     classes,
     inheritComponent: 'span',
+    mount,
     render,
     refInstanceof: window.HTMLSpanElement,
     testComponentPropWith: 'span',
+    skip: [
+      'themeDefaultProps', // unstyled
+      'themeStyleOverrides', // unstyled
+      'themeVariants', // unstyled
+    ],
   }));
 
   it('forwards style props on the Root component', () => {
diff --git a/packages/material-ui/src/Accordion/Accordion.test.js b/packages/material-ui/src/Accordion/Accordion.test.js
index ceea1cc728eaf3..54de902b7d5fd0 100644
--- a/packages/material-ui/src/Accordion/Accordion.test.js
+++ b/packages/material-ui/src/Accordion/Accordion.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, createClientRender, fireEvent } from 'test/utils';
 import Accordion, { accordionClasses as classes } from '@material-ui/core/Accordion';
 import Paper from '@material-ui/core/Paper';
 import AccordionSummary from '@material-ui/core/AccordionSummary';
@@ -12,7 +12,7 @@ describe('<Accordion />', () => {
 
   const minimalChildren = [<AccordionSummary key="header">Header</AccordionSummary>];
 
-  describeConformanceV5(<Accordion>{minimalChildren}</Accordion>, () => ({
+  describeConformance(<Accordion>{minimalChildren}</Accordion>, () => ({
     classes,
     inheritComponent: Paper,
     render,
diff --git a/packages/material-ui/src/AccordionActions/AccordionActions.test.js b/packages/material-ui/src/AccordionActions/AccordionActions.test.js
index acc9445c7eec33..8fd54ea7ed2ecd 100644
--- a/packages/material-ui/src/AccordionActions/AccordionActions.test.js
+++ b/packages/material-ui/src/AccordionActions/AccordionActions.test.js
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import AccordionActions, {
   accordionActionsClasses as classes,
 } from '@material-ui/core/AccordionActions';
@@ -7,7 +7,7 @@ import AccordionActions, {
 describe('<AccordionActions />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<AccordionActions>Conformance</AccordionActions>, () => ({
+  describeConformance(<AccordionActions>Conformance</AccordionActions>, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/AccordionDetails/AccordionDetails.test.js b/packages/material-ui/src/AccordionDetails/AccordionDetails.test.js
index cd5e0f40a3aa38..750d142128801e 100644
--- a/packages/material-ui/src/AccordionDetails/AccordionDetails.test.js
+++ b/packages/material-ui/src/AccordionDetails/AccordionDetails.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import AccordionDetails, {
   accordionDetailsClasses as classes,
 } from '@material-ui/core/AccordionDetails';
@@ -8,7 +8,7 @@ import AccordionDetails, {
 describe('<AccordionDetails />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<AccordionDetails>Conformance</AccordionDetails>, () => ({
+  describeConformance(<AccordionDetails>Conformance</AccordionDetails>, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/AccordionSummary/AccordionSummary.test.js b/packages/material-ui/src/AccordionSummary/AccordionSummary.test.js
index a59b6e9c18abc7..39239c46b46214 100644
--- a/packages/material-ui/src/AccordionSummary/AccordionSummary.test.js
+++ b/packages/material-ui/src/AccordionSummary/AccordionSummary.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, act, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent } from 'test/utils';
 import AccordionSummary, {
   accordionSummaryClasses as classes,
 } from '@material-ui/core/AccordionSummary';
@@ -11,7 +11,7 @@ import ButtonBase from '@material-ui/core/ButtonBase';
 describe('<AccordionSummary />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<AccordionSummary />, () => ({
+  describeConformance(<AccordionSummary />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/Alert/Alert.test.js b/packages/material-ui/src/Alert/Alert.test.js
index 2eab7bf700927f..60ef790036fba3 100644
--- a/packages/material-ui/src/Alert/Alert.test.js
+++ b/packages/material-ui/src/Alert/Alert.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Alert, { alertClasses as classes } from '@material-ui/core/Alert';
 import Paper from '@material-ui/core/Paper';
 
 describe('<Alert />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Alert />, () => ({
+  describeConformance(<Alert />, () => ({
     classes,
     inheritComponent: Paper,
     render,
diff --git a/packages/material-ui/src/AlertTitle/AlertTitle.test.js b/packages/material-ui/src/AlertTitle/AlertTitle.test.js
index db65d3f53ba2be..73e332c4a2ee68 100644
--- a/packages/material-ui/src/AlertTitle/AlertTitle.test.js
+++ b/packages/material-ui/src/AlertTitle/AlertTitle.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import AlertTitle, { alertTitleClasses as classes } from '@material-ui/core/AlertTitle';
 
 describe('<AlertTitle />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<AlertTitle />, () => ({
+  describeConformance(<AlertTitle />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/AppBar/AppBar.test.js b/packages/material-ui/src/AppBar/AppBar.test.js
index acd3bb304a60c7..d47bdf553592b9 100644
--- a/packages/material-ui/src/AppBar/AppBar.test.js
+++ b/packages/material-ui/src/AppBar/AppBar.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5, screen } from 'test/utils';
+import { createClientRender, describeConformance, screen } from 'test/utils';
 import AppBar, { appBarClasses as classes } from '@material-ui/core/AppBar';
 import Paper from '@material-ui/core/Paper';
 
 describe('<AppBar />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<AppBar>Conformance?</AppBar>, () => ({
+  describeConformance(<AppBar>Conformance?</AppBar>, () => ({
     classes,
     inheritComponent: Paper,
     render,
diff --git a/packages/material-ui/src/Autocomplete/Autocomplete.test.js b/packages/material-ui/src/Autocomplete/Autocomplete.test.js
index 94e9b9e832aba6..37c9c56279b005 100644
--- a/packages/material-ui/src/Autocomplete/Autocomplete.test.js
+++ b/packages/material-ui/src/Autocomplete/Autocomplete.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
-import { describeConformanceV5, act, createClientRender, fireEvent, screen } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent, screen } from 'test/utils';
 import { spy } from 'sinon';
 import { ThemeProvider, createTheme } from '@material-ui/core/styles';
 import TextField from '@material-ui/core/TextField';
@@ -29,7 +29,7 @@ function checkHighlightIs(listbox, expected) {
 describe('<Autocomplete />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <Autocomplete options={[]} renderInput={(params) => <TextField {...params} />} />,
     () => ({
       classes,
diff --git a/packages/material-ui/src/Avatar/Avatar.test.js b/packages/material-ui/src/Avatar/Avatar.test.js
index aa9f804dfa4667..6776160d10450c 100644
--- a/packages/material-ui/src/Avatar/Avatar.test.js
+++ b/packages/material-ui/src/Avatar/Avatar.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, fireEvent, describeConformanceV5 } from 'test/utils';
+import { createClientRender, fireEvent, describeConformance } from 'test/utils';
 import { spy } from 'sinon';
 import Avatar, { avatarClasses as classes } from '@material-ui/core/Avatar';
 import CancelIcon from '../internal/svg-icons/Cancel';
@@ -8,7 +8,7 @@ import CancelIcon from '../internal/svg-icons/Cancel';
 describe('<Avatar />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Avatar />, () => ({
+  describeConformance(<Avatar />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/AvatarGroup/AvatarGroup.test.js b/packages/material-ui/src/AvatarGroup/AvatarGroup.test.js
index 99eced4ccd7c2f..a3bf5b9778dc5e 100644
--- a/packages/material-ui/src/AvatarGroup/AvatarGroup.test.js
+++ b/packages/material-ui/src/AvatarGroup/AvatarGroup.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import Avatar from '@material-ui/core/Avatar';
 import AvatarGroup, { avatarGroupClasses as classes } from '@material-ui/core/AvatarGroup';
 
 describe('<AvatarGroup />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <AvatarGroup>
       <div />
     </AvatarGroup>,
diff --git a/packages/material-ui/src/Backdrop/Backdrop.test.js b/packages/material-ui/src/Backdrop/Backdrop.test.js
index 86b1a8631906da..8e6e151b830338 100644
--- a/packages/material-ui/src/Backdrop/Backdrop.test.js
+++ b/packages/material-ui/src/Backdrop/Backdrop.test.js
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy, useFakeTimers } from 'sinon';
-import { createClientRender, describeConformanceV5, act } from 'test/utils';
+import { createClientRender, describeConformance, act } from 'test/utils';
 import Backdrop, { backdropClasses as classes } from '@material-ui/core/Backdrop';
 import Fade from '@material-ui/core/Fade';
 
 describe('<Backdrop />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Backdrop open />, () => ({
+  describeConformance(<Backdrop open />, () => ({
     classes,
     inheritComponent: Fade,
     render,
diff --git a/packages/material-ui/src/Badge/Badge.test.js b/packages/material-ui/src/Badge/Badge.test.js
index afb44c642a64cd..7e35341591f213 100644
--- a/packages/material-ui/src/Badge/Badge.test.js
+++ b/packages/material-ui/src/Badge/Badge.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { BadgeUnstyled } from '@material-ui/unstyled';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Badge, { badgeClasses as classes } from '@material-ui/core/Badge';
 
 function findBadge(container) {
@@ -20,7 +20,7 @@ describe('<Badge />', () => {
     badgeContent: 10,
   };
 
-  describeConformanceV5(
+  describeConformance(
     <Badge>
       <div />
     </Badge>,
diff --git a/packages/material-ui/src/BottomNavigation/BottomNavigation.test.js b/packages/material-ui/src/BottomNavigation/BottomNavigation.test.js
index 8e8a457d1542d0..4442645c5c6633 100755
--- a/packages/material-ui/src/BottomNavigation/BottomNavigation.test.js
+++ b/packages/material-ui/src/BottomNavigation/BottomNavigation.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, createClientRender, fireEvent } from 'test/utils';
 import BottomNavigation, {
   bottomNavigationClasses as classes,
 } from '@material-ui/core/BottomNavigation';
@@ -16,7 +16,7 @@ describe('<BottomNavigation />', () => {
   const icon = <Icon>restore</Icon>;
   const getBottomNavigation = (container) => container.firstChild;
 
-  describeConformanceV5(
+  describeConformance(
     <BottomNavigation>
       <BottomNavigationAction label="One" />
     </BottomNavigation>,
diff --git a/packages/material-ui/src/BottomNavigationAction/BottomNavigationAction.test.js b/packages/material-ui/src/BottomNavigationAction/BottomNavigationAction.test.js
index 4cf5b358e92de6..aab6f6161f8b25 100644
--- a/packages/material-ui/src/BottomNavigationAction/BottomNavigationAction.test.js
+++ b/packages/material-ui/src/BottomNavigationAction/BottomNavigationAction.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, createClientRender, within } from 'test/utils';
+import { describeConformance, createClientRender, within } from 'test/utils';
 import BottomNavigationAction, {
   bottomNavigationActionClasses as classes,
 } from '@material-ui/core/BottomNavigationAction';
@@ -10,7 +10,7 @@ import ButtonBase from '@material-ui/core/ButtonBase';
 describe('<BottomNavigationAction />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<BottomNavigationAction />, () => ({
+  describeConformance(<BottomNavigationAction />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/Box/Box.test.js b/packages/material-ui/src/Box/Box.test.js
index 790053b40a86bc..f45ec03708a431 100644
--- a/packages/material-ui/src/Box/Box.test.js
+++ b/packages/material-ui/src/Box/Box.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { createTheme, ThemeProvider } from '@material-ui/core/styles';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Box from '@material-ui/core/Box';
 
 describe('<Box />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Box />, () => ({
+  describeConformance(<Box />, () => ({
     render,
     inheritComponent: 'div',
     skip: [
diff --git a/packages/material-ui/src/Breadcrumbs/Breadcrumbs.test.js b/packages/material-ui/src/Breadcrumbs/Breadcrumbs.test.js
index dfa7131494cbc9..0400fabea85e20 100644
--- a/packages/material-ui/src/Breadcrumbs/Breadcrumbs.test.js
+++ b/packages/material-ui/src/Breadcrumbs/Breadcrumbs.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { act, describeConformanceV5, createClientRender, screen } from 'test/utils';
+import { act, describeConformance, createClientRender, screen } from 'test/utils';
 import Breadcrumbs, { breadcrumbsClasses as classes } from '@material-ui/core/Breadcrumbs';
 
 describe('<Breadcrumbs />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Breadcrumbs>Conformance?</Breadcrumbs>, () => ({
+  describeConformance(<Breadcrumbs>Conformance?</Breadcrumbs>, () => ({
     classes,
     inheritComponent: 'nav',
     render,
diff --git a/packages/material-ui/src/Button/Button.test.js b/packages/material-ui/src/Button/Button.test.js
index 6fed3d2ece3767..314690468d5420 100644
--- a/packages/material-ui/src/Button/Button.test.js
+++ b/packages/material-ui/src/Button/Button.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import {
-  describeConformanceV5,
+  describeConformance,
   act,
   createClientRender,
   fireEvent,
@@ -13,7 +13,7 @@ import ButtonBase from '@material-ui/core/ButtonBase';
 describe('<Button />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Button startIcon="icon">Conformance?</Button>, () => ({
+  describeConformance(<Button startIcon="icon">Conformance?</Button>, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/ButtonBase/ButtonBase.test.js b/packages/material-ui/src/ButtonBase/ButtonBase.test.js
index 55c50d27c47b16..339119a0e5b4a8 100644
--- a/packages/material-ui/src/ButtonBase/ButtonBase.test.js
+++ b/packages/material-ui/src/ButtonBase/ButtonBase.test.js
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { expect } from 'chai';
 import { spy, stub } from 'sinon';
 import {
-  describeConformanceV5,
+  describeConformance,
   act,
   createClientRender,
   fireEvent,
@@ -33,7 +33,7 @@ describe('<ButtonBase />', () => {
     }
   });
 
-  describeConformanceV5(<ButtonBase />, () => ({
+  describeConformance(<ButtonBase />, () => ({
     classes,
     inheritComponent: 'button',
     render,
diff --git a/packages/material-ui/src/ButtonBase/TouchRipple.test.js b/packages/material-ui/src/ButtonBase/TouchRipple.test.js
index ccfa77cb8b1966..3a82f4a85374dd 100644
--- a/packages/material-ui/src/ButtonBase/TouchRipple.test.js
+++ b/packages/material-ui/src/ButtonBase/TouchRipple.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useFakeTimers } from 'sinon';
 import { expect } from 'chai';
-import { describeConformanceV5, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createClientRender } from 'test/utils';
 import TouchRipple, { DELAY_RIPPLE } from './TouchRipple';
 
 const cb = () => {};
@@ -42,7 +42,7 @@ describe('<TouchRipple />', () => {
     };
   }
 
-  describeConformanceV5(<TouchRipple />, () => ({
+  describeConformance(<TouchRipple />, () => ({
     classes: {},
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui/src/ButtonGroup/ButtonGroup.test.js b/packages/material-ui/src/ButtonGroup/ButtonGroup.test.js
index 024b78bd1c3b44..355d57bc6be5be 100644
--- a/packages/material-ui/src/ButtonGroup/ButtonGroup.test.js
+++ b/packages/material-ui/src/ButtonGroup/ButtonGroup.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import ButtonGroup, { buttonGroupClasses as classes } from '@material-ui/core/ButtonGroup';
 import Button from '@material-ui/core/Button';
 
 describe('<ButtonGroup />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <ButtonGroup>
       <Button>Conformance?</Button>
     </ButtonGroup>,
diff --git a/packages/material-ui/src/Card/Card.test.tsx b/packages/material-ui/src/Card/Card.test.tsx
index 4d2b33cc3090fc..0a83a7f56799cd 100644
--- a/packages/material-ui/src/Card/Card.test.tsx
+++ b/packages/material-ui/src/Card/Card.test.tsx
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Card, { cardClasses as classes } from '@material-ui/core/Card';
 import Paper from '@material-ui/core/Paper';
 
 describe('<Card />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Card />, () => ({
+  describeConformance(<Card />, () => ({
     classes,
     inheritComponent: Paper,
     render,
diff --git a/packages/material-ui/src/CardActionArea/CardActionArea.test.js b/packages/material-ui/src/CardActionArea/CardActionArea.test.js
index 0da3fca4530cda..b79365ce5329a8 100644
--- a/packages/material-ui/src/CardActionArea/CardActionArea.test.js
+++ b/packages/material-ui/src/CardActionArea/CardActionArea.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import CardActionArea, { cardActionAreaClasses as classes } from '@material-ui/core/CardActionArea';
 import ButtonBase from '@material-ui/core/ButtonBase';
 
 describe('<CardActionArea />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<CardActionArea />, () => ({
+  describeConformance(<CardActionArea />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/CardActions/CardActions.test.js b/packages/material-ui/src/CardActions/CardActions.test.js
index ce57bf699d2c75..1b07fcd9d21c60 100644
--- a/packages/material-ui/src/CardActions/CardActions.test.js
+++ b/packages/material-ui/src/CardActions/CardActions.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import CardActions, { cardActionsClasses as classes } from '@material-ui/core/CardActions';
 
 describe('<CardActions />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<CardActions />, () => ({
+  describeConformance(<CardActions />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/CardContent/CardContent.test.js b/packages/material-ui/src/CardContent/CardContent.test.js
index b2160bd781025d..b12ef0b9e7396d 100644
--- a/packages/material-ui/src/CardContent/CardContent.test.js
+++ b/packages/material-ui/src/CardContent/CardContent.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import CardContent, { cardContentClasses as classes } from '@material-ui/core/CardContent';
 
 describe('<CardContent />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<CardContent />, () => ({
+  describeConformance(<CardContent />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/CardHeader/CardHeader.test.js b/packages/material-ui/src/CardHeader/CardHeader.test.js
index 1d41f850e2b1e5..8307dc918a356b 100644
--- a/packages/material-ui/src/CardHeader/CardHeader.test.js
+++ b/packages/material-ui/src/CardHeader/CardHeader.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import { typographyClasses } from '@material-ui/core/Typography';
 import CardHeader, { cardHeaderClasses as classes } from '@material-ui/core/CardHeader';
 
 describe('<CardHeader />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<CardHeader />, () => ({
+  describeConformance(<CardHeader />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/CardMedia/CardMedia.test.js b/packages/material-ui/src/CardMedia/CardMedia.test.js
index e9224ce72e28d9..aa0473ff435567 100644
--- a/packages/material-ui/src/CardMedia/CardMedia.test.js
+++ b/packages/material-ui/src/CardMedia/CardMedia.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import CardMedia, { cardMediaClasses as classes } from '@material-ui/core/CardMedia';
 
 describe('<CardMedia />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<CardMedia image="/fake.png" />, () => ({
+  describeConformance(<CardMedia image="/fake.png" />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Checkbox/Checkbox.test.js b/packages/material-ui/src/Checkbox/Checkbox.test.js
index 0402766ebb4660..8c7bdf4ef74ab1 100644
--- a/packages/material-ui/src/Checkbox/Checkbox.test.js
+++ b/packages/material-ui/src/Checkbox/Checkbox.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createClientRender } from 'test/utils';
 import Checkbox, { checkboxClasses as classes } from '@material-ui/core/Checkbox';
 import FormControl from '@material-ui/core/FormControl';
 import ButtonBase from '@material-ui/core/ButtonBase';
@@ -9,7 +9,7 @@ import ButtonBase from '@material-ui/core/ButtonBase';
 describe('<Checkbox />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Checkbox checked />, () => ({
+  describeConformance(<Checkbox checked />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/Chip/Chip.test.js b/packages/material-ui/src/Chip/Chip.test.js
index d0e7750d509e61..31d4b74fd4243a 100644
--- a/packages/material-ui/src/Chip/Chip.test.js
+++ b/packages/material-ui/src/Chip/Chip.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { expect } from 'chai';
 import { spy, stub } from 'sinon';
 import {
-  describeConformanceV5,
+  describeConformance,
   act,
   createClientRender,
   fireEvent,
@@ -17,7 +17,7 @@ import CheckBox from '../internal/svg-icons/CheckBox';
 describe('<Chip />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Chip />, () => ({
+  describeConformance(<Chip />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/CircularProgress/CircularProgress.test.js b/packages/material-ui/src/CircularProgress/CircularProgress.test.js
index b7ae80114e5d80..4f3fe4f6ce927c 100644
--- a/packages/material-ui/src/CircularProgress/CircularProgress.test.js
+++ b/packages/material-ui/src/CircularProgress/CircularProgress.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import CircularProgress, {
   circularProgressClasses as classes,
 } from '@material-ui/core/CircularProgress';
@@ -8,7 +8,7 @@ import CircularProgress, {
 describe('<CircularProgress />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<CircularProgress />, () => ({
+  describeConformance(<CircularProgress />, () => ({
     classes,
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui/src/Collapse/Collapse.test.js b/packages/material-ui/src/Collapse/Collapse.test.js
index af09064f1ecca6..182f39d25146de 100644
--- a/packages/material-ui/src/Collapse/Collapse.test.js
+++ b/packages/material-ui/src/Collapse/Collapse.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy, stub, useFakeTimers } from 'sinon';
-import { act, createClientRender, describeConformanceV5 } from 'test/utils';
+import { act, createClientRender, describeConformance } from 'test/utils';
 import { ThemeProvider, createTheme } from '@material-ui/core/styles';
 import { Transition } from 'react-transition-group';
 import Collapse, { collapseClasses as classes } from '@material-ui/core/Collapse';
@@ -14,7 +14,7 @@ describe('<Collapse />', () => {
     children: <div />,
   };
 
-  describeConformanceV5(<Collapse {...defaultProps} />, () => ({
+  describeConformance(<Collapse {...defaultProps} />, () => ({
     classes,
     inheritComponent: Transition,
     render,
diff --git a/packages/material-ui/src/Container/Container.test.js b/packages/material-ui/src/Container/Container.test.js
index d7bdd0248fe23b..624ac7774523c4 100644
--- a/packages/material-ui/src/Container/Container.test.js
+++ b/packages/material-ui/src/Container/Container.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import Container, { containerClasses as classes } from '@material-ui/core/Container';
 
 describe('<Container />', () => {
@@ -10,7 +10,7 @@ describe('<Container />', () => {
     children: <div />,
   };
 
-  describeConformanceV5(<Container {...defaultProps} />, () => ({
+  describeConformance(<Container {...defaultProps} />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Dialog/Dialog.test.js b/packages/material-ui/src/Dialog/Dialog.test.js
index aae355aca83207..300ff78d4d81cf 100644
--- a/packages/material-ui/src/Dialog/Dialog.test.js
+++ b/packages/material-ui/src/Dialog/Dialog.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy, useFakeTimers } from 'sinon';
-import { describeConformanceV5, act, createClientRender, fireEvent, screen } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent, screen } from 'test/utils';
 import Modal from '@material-ui/core/Modal';
 import Dialog, { dialogClasses as classes } from '@material-ui/core/Dialog';
 
@@ -43,7 +43,7 @@ describe('<Dialog />', () => {
 
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <Dialog open disablePortal>
       foo
     </Dialog>,
diff --git a/packages/material-ui/src/DialogActions/DialogActions.test.js b/packages/material-ui/src/DialogActions/DialogActions.test.js
index 49160ecb45ebd8..962f8b23f4d993 100644
--- a/packages/material-ui/src/DialogActions/DialogActions.test.js
+++ b/packages/material-ui/src/DialogActions/DialogActions.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import DialogActions, { dialogActionsClasses as classes } from '@material-ui/core/DialogActions';
 
 describe('<DialogActions />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<DialogActions />, () => ({
+  describeConformance(<DialogActions />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/DialogContent/DialogContent.test.js b/packages/material-ui/src/DialogContent/DialogContent.test.js
index 88d30bb69dab2b..44687522ba6bc3 100644
--- a/packages/material-ui/src/DialogContent/DialogContent.test.js
+++ b/packages/material-ui/src/DialogContent/DialogContent.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import DialogContent, { dialogContentClasses as classes } from '@material-ui/core/DialogContent';
 
 describe('<DialogContent />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<DialogContent />, () => ({
+  describeConformance(<DialogContent />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/DialogContentText/DialogContentText.test.js b/packages/material-ui/src/DialogContentText/DialogContentText.test.js
index d29fd747b80f97..b3220e489e917c 100644
--- a/packages/material-ui/src/DialogContentText/DialogContentText.test.js
+++ b/packages/material-ui/src/DialogContentText/DialogContentText.test.js
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Typography from '@material-ui/core/Typography';
 import DialogContentText, {
   dialogContentTextClasses as classes,
@@ -8,7 +8,7 @@ import DialogContentText, {
 describe('<DialogContentText />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<DialogContentText>foo</DialogContentText>, () => ({
+  describeConformance(<DialogContentText>foo</DialogContentText>, () => ({
     classes,
     inheritComponent: Typography,
     render,
diff --git a/packages/material-ui/src/DialogTitle/DialogTitle.test.js b/packages/material-ui/src/DialogTitle/DialogTitle.test.js
index fa52ad0952a87c..96775fb37ee2b4 100644
--- a/packages/material-ui/src/DialogTitle/DialogTitle.test.js
+++ b/packages/material-ui/src/DialogTitle/DialogTitle.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import DialogTitle, { dialogTitleClasses as classes } from '@material-ui/core/DialogTitle';
 
 describe('<DialogTitle />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<DialogTitle>foo</DialogTitle>, () => ({
+  describeConformance(<DialogTitle>foo</DialogTitle>, () => ({
     classes,
     inheritComponent: 'h2',
     render,
diff --git a/packages/material-ui/src/Divider/Divider.test.js b/packages/material-ui/src/Divider/Divider.test.js
index 182beed662e731..7ebc9a30c3c4fd 100644
--- a/packages/material-ui/src/Divider/Divider.test.js
+++ b/packages/material-ui/src/Divider/Divider.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import Divider, { dividerClasses as classes } from '@material-ui/core/Divider';
 
 describe('<Divider />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Divider />, () => ({
+  describeConformance(<Divider />, () => ({
     classes,
     inheritComponent: 'hr',
     render,
diff --git a/packages/material-ui/src/Drawer/Drawer.test.js b/packages/material-ui/src/Drawer/Drawer.test.js
index 954521f1c8d52d..0d7259784154cf 100644
--- a/packages/material-ui/src/Drawer/Drawer.test.js
+++ b/packages/material-ui/src/Drawer/Drawer.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { useFakeTimers, spy } from 'sinon';
-import { act, createClientRender, describeConformanceV5, screen } from 'test/utils';
+import { act, createClientRender, describeConformance, screen } from 'test/utils';
 import { ThemeProvider, createTheme } from '@material-ui/core/styles';
 import Drawer, { drawerClasses as classes } from '@material-ui/core/Drawer';
 import { getAnchor, isHorizontal } from './Drawer';
@@ -20,7 +20,7 @@ describe('<Drawer />', () => {
 
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <Drawer open disablePortal>
       <div />
     </Drawer>,
diff --git a/packages/material-ui/src/Fab/Fab.test.js b/packages/material-ui/src/Fab/Fab.test.js
index 8429d850d55207..f1fa581b5c5fa2 100644
--- a/packages/material-ui/src/Fab/Fab.test.js
+++ b/packages/material-ui/src/Fab/Fab.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import {
-  describeConformanceV5,
+  describeConformance,
   createClientRender,
   createServerRender,
   act,
@@ -14,7 +14,7 @@ import Icon from '@material-ui/core/Icon';
 describe('<Fab />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Fab>Conformance?</Fab>, () => ({
+  describeConformance(<Fab>Conformance?</Fab>, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/Fade/Fade.test.js b/packages/material-ui/src/Fade/Fade.test.js
index 2307c6f556cdea..32e74cddd43793 100644
--- a/packages/material-ui/src/Fade/Fade.test.js
+++ b/packages/material-ui/src/Fade/Fade.test.js
@@ -19,6 +19,10 @@ describe('<Fade />', () => {
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',
+      'componentsProp',
+      'themeDefaultProps',
+      'themeStyleOverrides',
+      'themeVariants',
       // TODO: really?
       // react-transition-group issue
       'reactTestRenderer',
diff --git a/packages/material-ui/src/FilledInput/FilledInput.test.js b/packages/material-ui/src/FilledInput/FilledInput.test.js
index 9b308c85f046ac..dc771996366fca 100644
--- a/packages/material-ui/src/FilledInput/FilledInput.test.js
+++ b/packages/material-ui/src/FilledInput/FilledInput.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import FilledInput, { filledInputClasses as classes } from '@material-ui/core/FilledInput';
 import InputBase from '@material-ui/core/InputBase';
 
 describe('<FilledInput />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<FilledInput open />, () => ({
+  describeConformance(<FilledInput open />, () => ({
     classes,
     inheritComponent: InputBase,
     render,
diff --git a/packages/material-ui/src/FormControl/FormControl.test.js b/packages/material-ui/src/FormControl/FormControl.test.js
index b7e239935f74e6..1f102a29a7d8d1 100644
--- a/packages/material-ui/src/FormControl/FormControl.test.js
+++ b/packages/material-ui/src/FormControl/FormControl.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createClientRender } from 'test/utils';
 import FormControl, { formControlClasses as classes } from '@material-ui/core/FormControl';
 import Input from '@material-ui/core/Input';
 import Select from '@material-ui/core/Select';
@@ -18,7 +18,7 @@ describe('<FormControl />', () => {
     return null;
   }
 
-  describeConformanceV5(<FormControl />, () => ({
+  describeConformance(<FormControl />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/FormControlLabel/FormControlLabel.test.js b/packages/material-ui/src/FormControlLabel/FormControlLabel.test.js
index 16983bea41e2bd..15e4589fb1774c 100644
--- a/packages/material-ui/src/FormControlLabel/FormControlLabel.test.js
+++ b/packages/material-ui/src/FormControlLabel/FormControlLabel.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import FormControlLabel, {
   formControlLabelClasses as classes,
 } from '@material-ui/core/FormControlLabel';
@@ -11,7 +11,7 @@ import Typography from '@material-ui/core/Typography';
 describe('<FormControlLabel />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<FormControlLabel label="Pizza" control={<Checkbox />} />, () => ({
+  describeConformance(<FormControlLabel label="Pizza" control={<Checkbox />} />, () => ({
     classes,
     inheritComponent: 'label',
     render,
diff --git a/packages/material-ui/src/FormGroup/FormGroup.test.js b/packages/material-ui/src/FormGroup/FormGroup.test.js
index 0e8e0bcf0f8f1b..dd0b4abdd4a23c 100644
--- a/packages/material-ui/src/FormGroup/FormGroup.test.js
+++ b/packages/material-ui/src/FormGroup/FormGroup.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import FormGroup, { formGroupClasses as classes } from '@material-ui/core/FormGroup';
 
 describe('<FormGroup />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<FormGroup />, () => ({
+  describeConformance(<FormGroup />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/FormHelperText/FormHelperText.test.js b/packages/material-ui/src/FormHelperText/FormHelperText.test.js
index 4cc3d4fe01c119..02f2fa10a70877 100644
--- a/packages/material-ui/src/FormHelperText/FormHelperText.test.js
+++ b/packages/material-ui/src/FormHelperText/FormHelperText.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import FormHelperText, { formHelperTextClasses as classes } from '@material-ui/core/FormHelperText';
 import FormControl from '@material-ui/core/FormControl';
 
 describe('<FormHelperText />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<FormHelperText />, () => ({
+  describeConformance(<FormHelperText />, () => ({
     classes,
     inheritComponent: 'p',
     render,
diff --git a/packages/material-ui/src/FormLabel/FormLabel.test.js b/packages/material-ui/src/FormLabel/FormLabel.test.js
index 166687aa57768a..aa85a95ffbd990 100644
--- a/packages/material-ui/src/FormLabel/FormLabel.test.js
+++ b/packages/material-ui/src/FormLabel/FormLabel.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
-import { describeConformanceV5, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createClientRender } from 'test/utils';
 import FormLabel, { formLabelClasses as classes } from '@material-ui/core/FormLabel';
 import FormControl, { useFormControl } from '@material-ui/core/FormControl';
 import { hexToRgb } from '@material-ui/core/styles';
@@ -10,7 +10,7 @@ import defaultTheme from '../styles/defaultTheme';
 describe('<FormLabel />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<FormLabel />, () => ({
+  describeConformance(<FormLabel />, () => ({
     classes,
     inheritComponent: 'label',
     render,
diff --git a/packages/material-ui/src/Grid/Grid.test.js b/packages/material-ui/src/Grid/Grid.test.js
index 552c9c37a427c1..8712402d764725 100644
--- a/packages/material-ui/src/Grid/Grid.test.js
+++ b/packages/material-ui/src/Grid/Grid.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender, screen } from 'test/utils';
+import { describeConformance, createClientRender, screen } from 'test/utils';
 import { createTheme, ThemeProvider } from '@material-ui/core/styles';
 import defaultTheme from '@material-ui/core/styles/defaultTheme';
 import Grid, { gridClasses as classes } from '@material-ui/core/Grid';
@@ -9,7 +9,7 @@ import { generateRowGap, generateColumnGap } from './Grid';
 describe('<Grid />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Grid />, () => ({
+  describeConformance(<Grid />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Grow/Grow.test.js b/packages/material-ui/src/Grow/Grow.test.js
index 27b60fbb9719d4..18d105ce20b6ce 100644
--- a/packages/material-ui/src/Grow/Grow.test.js
+++ b/packages/material-ui/src/Grow/Grow.test.js
@@ -25,6 +25,10 @@ describe('<Grow />', () => {
       refInstanceof: window.HTMLDivElement,
       skip: [
         'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
         // react-transition-group issue
         'reactTestRenderer',
       ],
diff --git a/packages/material-ui/src/Icon/Icon.test.js b/packages/material-ui/src/Icon/Icon.test.js
index 835a814b3304d4..73d59e2cffd31f 100644
--- a/packages/material-ui/src/Icon/Icon.test.js
+++ b/packages/material-ui/src/Icon/Icon.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Icon, { iconClasses as classes } from '@material-ui/core/Icon';
 
 describe('<Icon />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Icon>account_circle</Icon>, () => ({
+  describeConformance(<Icon>account_circle</Icon>, () => ({
     classes,
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui/src/IconButton/IconButton.test.js b/packages/material-ui/src/IconButton/IconButton.test.js
index c9a7724d3e8218..5a2a241838de0e 100644
--- a/packages/material-ui/src/IconButton/IconButton.test.js
+++ b/packages/material-ui/src/IconButton/IconButton.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import PropTypes from 'prop-types';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import IconButton, { iconButtonClasses as classes } from '@material-ui/core/IconButton';
 import Icon from '@material-ui/core/Icon';
 import ButtonBase from '@material-ui/core/ButtonBase';
@@ -9,7 +9,7 @@ import ButtonBase from '@material-ui/core/ButtonBase';
 describe('<IconButton />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<IconButton>book</IconButton>, () => ({
+  describeConformance(<IconButton>book</IconButton>, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/ImageList/ImageList.test.js b/packages/material-ui/src/ImageList/ImageList.test.js
index c720a09df4028d..fa2f17ec433954 100644
--- a/packages/material-ui/src/ImageList/ImageList.test.js
+++ b/packages/material-ui/src/ImageList/ImageList.test.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import ImageList, { imageListClasses as classes } from '@material-ui/core/ImageList';
 
 const itemsData = [
@@ -19,7 +19,7 @@ const itemsData = [
 describe('<ImageList />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <ImageList>
       <div />
     </ImageList>,
diff --git a/packages/material-ui/src/ImageListItem/ImageListItem.test.js b/packages/material-ui/src/ImageListItem/ImageListItem.test.js
index 2a37395e32c6fd..808f42d7d542a7 100644
--- a/packages/material-ui/src/ImageListItem/ImageListItem.test.js
+++ b/packages/material-ui/src/ImageListItem/ImageListItem.test.js
@@ -1,13 +1,13 @@
 import { expect } from 'chai';
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import ImageList from '@material-ui/core/ImageList';
 import ImageListItem, { imageListItemClasses as classes } from '@material-ui/core/ImageListItem';
 
 describe('<ImageListItem />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ImageListItem />, () => ({
+  describeConformance(<ImageListItem />, () => ({
     classes,
     inheritComponent: 'li',
     render,
diff --git a/packages/material-ui/src/ImageListItemBar/ImageListItemBar.test.js b/packages/material-ui/src/ImageListItemBar/ImageListItemBar.test.js
index 07f3533d135c8f..ade1a60c0d6303 100644
--- a/packages/material-ui/src/ImageListItemBar/ImageListItemBar.test.js
+++ b/packages/material-ui/src/ImageListItemBar/ImageListItemBar.test.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import ImageListItemBar, {
   imageListItemBarClasses as classes,
 } from '@material-ui/core/ImageListItemBar';
@@ -8,7 +8,7 @@ import ImageListItemBar, {
 describe('<ImageListItemBar />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ImageListItemBar title="conform?" />, () => ({
+  describeConformance(<ImageListItemBar title="conform?" />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Input/Input.test.js b/packages/material-ui/src/Input/Input.test.js
index 53737b7bcfdbef..da24a8de57698e 100644
--- a/packages/material-ui/src/Input/Input.test.js
+++ b/packages/material-ui/src/Input/Input.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import InputBase from '@material-ui/core/InputBase';
 import Input, { inputClasses as classes } from '@material-ui/core/Input';
 
 describe('<Input />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Input />, () => ({
+  describeConformance(<Input />, () => ({
     classes,
     inheritComponent: InputBase,
     render,
diff --git a/packages/material-ui/src/InputAdornment/InputAdornment.test.js b/packages/material-ui/src/InputAdornment/InputAdornment.test.js
index 07aabd4fdd6770..54c62d6211b4bf 100644
--- a/packages/material-ui/src/InputAdornment/InputAdornment.test.js
+++ b/packages/material-ui/src/InputAdornment/InputAdornment.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import { typographyClasses } from '@material-ui/core/Typography';
 import InputAdornment, { inputAdornmentClasses as classes } from '@material-ui/core/InputAdornment';
 import TextField from '@material-ui/core/TextField';
@@ -10,7 +10,7 @@ import Input from '@material-ui/core/Input';
 describe('<InputAdornment />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<InputAdornment position="start">foo</InputAdornment>, () => ({
+  describeConformance(<InputAdornment position="start">foo</InputAdornment>, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/InputBase/InputBase.test.js b/packages/material-ui/src/InputBase/InputBase.test.js
index 6b35a1ff07b7c3..16abfe1ed2d086 100644
--- a/packages/material-ui/src/InputBase/InputBase.test.js
+++ b/packages/material-ui/src/InputBase/InputBase.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, act, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent } from 'test/utils';
 import FormControl, { useFormControl } from '@material-ui/core/FormControl';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import TextField from '@material-ui/core/TextField';
@@ -12,7 +12,7 @@ import InputBase, { inputBaseClasses as classes } from '@material-ui/core/InputB
 describe('<InputBase />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<InputBase />, () => ({
+  describeConformance(<InputBase />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/InputLabel/InputLabel.test.js b/packages/material-ui/src/InputLabel/InputLabel.test.js
index 5b8d012eab8327..082aa229a38ce3 100644
--- a/packages/material-ui/src/InputLabel/InputLabel.test.js
+++ b/packages/material-ui/src/InputLabel/InputLabel.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
-import { describeConformanceV5, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createClientRender } from 'test/utils';
 import FormControl from '@material-ui/core/FormControl';
 import Input from '@material-ui/core/Input';
 import FormLabel from '@material-ui/core/FormLabel';
@@ -10,7 +10,7 @@ import InputLabel, { inputLabelClasses as classes } from '@material-ui/core/Inpu
 describe('<InputLabel />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<InputLabel>Foo</InputLabel>, () => ({
+  describeConformance(<InputLabel>Foo</InputLabel>, () => ({
     classes,
     inheritComponent: FormLabel,
     render,
diff --git a/packages/material-ui/src/LinearProgress/LinearProgress.test.js b/packages/material-ui/src/LinearProgress/LinearProgress.test.js
index 1e1fa045c5f7cc..0507bf6032a361 100644
--- a/packages/material-ui/src/LinearProgress/LinearProgress.test.js
+++ b/packages/material-ui/src/LinearProgress/LinearProgress.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, screen, describeConformanceV5 } from 'test/utils';
+import { createClientRender, screen, describeConformance } from 'test/utils';
 import LinearProgress, { linearProgressClasses as classes } from '@material-ui/core/LinearProgress';
 
 describe('<LinearProgress />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<LinearProgress />, () => ({
+  describeConformance(<LinearProgress />, () => ({
     classes,
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui/src/Link/Link.test.js b/packages/material-ui/src/Link/Link.test.js
index 7efd816caa4bdc..b753ffaefc1458 100644
--- a/packages/material-ui/src/Link/Link.test.js
+++ b/packages/material-ui/src/Link/Link.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { act, createClientRender, fireEvent, describeConformanceV5 } from 'test/utils';
+import { act, createClientRender, fireEvent, describeConformance } from 'test/utils';
 import Link, { linkClasses as classes } from '@material-ui/core/Link';
 import Typography, { typographyClasses } from '@material-ui/core/Typography';
 
@@ -16,7 +16,7 @@ function focusVisible(element) {
 describe('<Link />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Link href="/">Home</Link>, () => ({
+  describeConformance(<Link href="/">Home</Link>, () => ({
     classes,
     inheritComponent: Typography,
     render,
diff --git a/packages/material-ui/src/List/List.test.js b/packages/material-ui/src/List/List.test.js
index fe03d153c38cce..d2982841119a71 100644
--- a/packages/material-ui/src/List/List.test.js
+++ b/packages/material-ui/src/List/List.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import ListSubheader, { listSubheaderClasses } from '@material-ui/core/ListSubheader';
 import ListItem, { listItemClasses } from '@material-ui/core/ListItem';
 import List, { listClasses as classes } from '@material-ui/core/List';
@@ -8,7 +8,7 @@ import List, { listClasses as classes } from '@material-ui/core/List';
 describe('<List />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<List />, () => ({
+  describeConformance(<List />, () => ({
     classes,
     inheritComponent: 'ul',
     render,
diff --git a/packages/material-ui/src/ListItem/ListItem.test.js b/packages/material-ui/src/ListItem/ListItem.test.js
index ebb3bbbd194a7e..a479b48e1710b6 100644
--- a/packages/material-ui/src/ListItem/ListItem.test.js
+++ b/packages/material-ui/src/ListItem/ListItem.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import PropTypes from 'prop-types';
-import { describeConformanceV5, act, createClientRender, fireEvent, queries } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent, queries } from 'test/utils';
 import { ThemeProvider, createTheme } from '@material-ui/core/styles';
 import ListItemText from '@material-ui/core/ListItemText';
 import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
@@ -15,7 +15,7 @@ const NoContent = React.forwardRef(() => {
 describe('<ListItem />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ListItem />, () => ({
+  describeConformance(<ListItem />, () => ({
     classes,
     inheritComponent: 'li',
     render,
diff --git a/packages/material-ui/src/ListItemAvatar/ListItemAvatar.test.js b/packages/material-ui/src/ListItemAvatar/ListItemAvatar.test.js
index 53ea5fc91039ab..36a391aabcf5ef 100644
--- a/packages/material-ui/src/ListItemAvatar/ListItemAvatar.test.js
+++ b/packages/material-ui/src/ListItemAvatar/ListItemAvatar.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import ListItemAvatar, { listItemAvatarClasses as classes } from '@material-ui/core/ListItemAvatar';
 
 describe('<ListItemAvatar />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <ListItemAvatar>
       <div />
     </ListItemAvatar>,
diff --git a/packages/material-ui/src/ListItemButton/ListItemButton.test.js b/packages/material-ui/src/ListItemButton/ListItemButton.test.js
index e55a47ddd4004f..ce9f3069a5a8f1 100644
--- a/packages/material-ui/src/ListItemButton/ListItemButton.test.js
+++ b/packages/material-ui/src/ListItemButton/ListItemButton.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, act, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent } from 'test/utils';
 import ListItemButton, { listItemButtonClasses as classes } from '@material-ui/core/ListItemButton';
 import ButtonBase from '@material-ui/core/ButtonBase';
 import ListContext from '../List/ListContext';
@@ -8,7 +8,7 @@ import ListContext from '../List/ListContext';
 describe('<ListItemButton />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ListItemButton />, () => ({
+  describeConformance(<ListItemButton />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/ListItemIcon/ListItemIcon.test.js b/packages/material-ui/src/ListItemIcon/ListItemIcon.test.js
index adb6760352d985..3ad13b4115a6a6 100644
--- a/packages/material-ui/src/ListItemIcon/ListItemIcon.test.js
+++ b/packages/material-ui/src/ListItemIcon/ListItemIcon.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import ListItemIcon, { listItemIconClasses as classes } from '@material-ui/core/ListItemIcon';
 
 describe('<ListItemIcon />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <ListItemIcon>
       <div />
     </ListItemIcon>,
diff --git a/packages/material-ui/src/ListItemSecondaryAction/ListItemSecondaryAction.test.js b/packages/material-ui/src/ListItemSecondaryAction/ListItemSecondaryAction.test.js
index febfa717f05a9d..938fa981c41ebf 100644
--- a/packages/material-ui/src/ListItemSecondaryAction/ListItemSecondaryAction.test.js
+++ b/packages/material-ui/src/ListItemSecondaryAction/ListItemSecondaryAction.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemSecondaryAction, {
   listItemSecondaryActionClasses as classes,
@@ -9,7 +9,7 @@ import ListItemSecondaryAction, {
 describe('<ListItemSecondaryAction />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ListItemSecondaryAction />, () => ({
+  describeConformance(<ListItemSecondaryAction />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/ListItemText/ListItemText.test.js b/packages/material-ui/src/ListItemText/ListItemText.test.js
index 0fcd7665d1f140..7d8e03c7be50c0 100644
--- a/packages/material-ui/src/ListItemText/ListItemText.test.js
+++ b/packages/material-ui/src/ListItemText/ListItemText.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Typography, { typographyClasses } from '@material-ui/core/Typography';
 import ListItemText, { listItemTextClasses as classes } from '@material-ui/core/ListItemText';
 
 describe('<ListItemText />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ListItemText>Conformance?</ListItemText>, () => ({
+  describeConformance(<ListItemText>Conformance?</ListItemText>, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/ListSubheader/ListSubheader.test.js b/packages/material-ui/src/ListSubheader/ListSubheader.test.js
index 8cd213c89d287e..f02621f141616b 100644
--- a/packages/material-ui/src/ListSubheader/ListSubheader.test.js
+++ b/packages/material-ui/src/ListSubheader/ListSubheader.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import ListSubheader, { listSubheaderClasses as classes } from '@material-ui/core/ListSubheader';
 
 describe('<ListSubheader />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ListSubheader />, () => ({
+  describeConformance(<ListSubheader />, () => ({
     classes,
     inheritComponent: 'li',
     render,
diff --git a/packages/material-ui/src/Menu/Menu.test.js b/packages/material-ui/src/Menu/Menu.test.js
index 6a77f9c009950b..b1bc7ccd78e091 100644
--- a/packages/material-ui/src/Menu/Menu.test.js
+++ b/packages/material-ui/src/Menu/Menu.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { spy, useFakeTimers } from 'sinon';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5, screen, fireEvent } from 'test/utils';
+import { createClientRender, describeConformance, screen, fireEvent } from 'test/utils';
 import Menu, { menuClasses as classes } from '@material-ui/core/Menu';
 import Popover from '@material-ui/core/Popover';
 
@@ -19,7 +19,7 @@ describe('<Menu />', () => {
 
   const render = createClientRender();
 
-  describeConformanceV5(<Menu anchorEl={() => document.createElement('div')} open />, () => ({
+  describeConformance(<Menu anchorEl={() => document.createElement('div')} open />, () => ({
     classes,
     inheritComponent: Popover,
     render,
diff --git a/packages/material-ui/src/MenuItem/MenuItem.test.js b/packages/material-ui/src/MenuItem/MenuItem.test.js
index cbceac934bbd0b..6642a8736fb4bf 100644
--- a/packages/material-ui/src/MenuItem/MenuItem.test.js
+++ b/packages/material-ui/src/MenuItem/MenuItem.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { act, describeConformanceV5, createClientRender, fireEvent, screen } from 'test/utils';
+import { act, describeConformance, createClientRender, fireEvent, screen } from 'test/utils';
 import MenuItem, { menuItemClasses as classes } from '@material-ui/core/MenuItem';
 import ButtonBase from '@material-ui/core/ButtonBase';
 import ListContext from '../List/ListContext';
@@ -9,7 +9,7 @@ import ListContext from '../List/ListContext';
 describe('<MenuItem />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<MenuItem />, () => ({
+  describeConformance(<MenuItem />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/MenuList/MenuList.test.js b/packages/material-ui/src/MenuList/MenuList.test.js
index 2049b9ed5f747d..63a31318f3c1bf 100644
--- a/packages/material-ui/src/MenuList/MenuList.test.js
+++ b/packages/material-ui/src/MenuList/MenuList.test.js
@@ -23,7 +23,13 @@ describe('<MenuList />', () => {
     classes: {},
     inheritComponent: List,
     refInstanceof: window.HTMLUListElement,
-    skip: ['componentProp'],
+    skip: [
+      'componentProp',
+      'componentsProp',
+      'themeDefaultProps',
+      'themeStyleOverrides',
+      'themeVariants',
+    ],
   }));
 
   describe('prop: children', () => {
diff --git a/packages/material-ui/src/MobileStepper/MobileStepper.test.js b/packages/material-ui/src/MobileStepper/MobileStepper.test.js
index cfeb6503600667..f9c7ed501cb832 100644
--- a/packages/material-ui/src/MobileStepper/MobileStepper.test.js
+++ b/packages/material-ui/src/MobileStepper/MobileStepper.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5, screen } from 'test/utils';
+import { createClientRender, describeConformance, screen } from 'test/utils';
 import Paper, { paperClasses } from '@material-ui/core/Paper';
 import Button from '@material-ui/core/Button';
 import MobileStepper, { mobileStepperClasses as classes } from '@material-ui/core/MobileStepper';
@@ -25,7 +25,7 @@ describe('<MobileStepper />', () => {
     ),
   };
 
-  describeConformanceV5(<MobileStepper {...defaultProps} />, () => ({
+  describeConformance(<MobileStepper {...defaultProps} />, () => ({
     classes,
     inheritComponent: Paper,
     render,
diff --git a/packages/material-ui/src/Modal/Modal.test.js b/packages/material-ui/src/Modal/Modal.test.js
index a2b006832ca82d..ea40bb1288a0e8 100644
--- a/packages/material-ui/src/Modal/Modal.test.js
+++ b/packages/material-ui/src/Modal/Modal.test.js
@@ -8,7 +8,7 @@ import {
   createClientRender,
   fireEvent,
   within,
-  describeConformanceV5,
+  describeConformance,
   screen,
 } from 'test/utils';
 import { createTheme, ThemeProvider } from '@material-ui/core/styles';
@@ -28,7 +28,7 @@ describe('<Modal />', () => {
     document.body.setAttribute('style', savedBodyStyle);
   });
 
-  describeConformanceV5(
+  describeConformance(
     <Modal open>
       <div />
     </Modal>,
diff --git a/packages/material-ui/src/NativeSelect/NativeSelect.test.js b/packages/material-ui/src/NativeSelect/NativeSelect.test.js
index e7e6fbbc1f658e..7cf6e9d3f65c33 100644
--- a/packages/material-ui/src/NativeSelect/NativeSelect.test.js
+++ b/packages/material-ui/src/NativeSelect/NativeSelect.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { createTheme, ThemeProvider, styled } from '@material-ui/core/styles';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import NativeSelect, { nativeSelectClasses as classes } from '@material-ui/core/NativeSelect';
 import Input, { inputClasses } from '@material-ui/core/Input';
 
@@ -19,7 +19,7 @@ describe('<NativeSelect />', () => {
     ],
   };
 
-  describeConformanceV5(<NativeSelect {...defaultProps} />, () => ({
+  describeConformance(<NativeSelect {...defaultProps} />, () => ({
     classes,
     inheritComponent: Input,
     render,
diff --git a/packages/material-ui/src/NativeSelect/NativeSelectInput.test.js b/packages/material-ui/src/NativeSelect/NativeSelectInput.test.js
index 84ba503cffaf1a..e01295d3b225b1 100644
--- a/packages/material-ui/src/NativeSelect/NativeSelectInput.test.js
+++ b/packages/material-ui/src/NativeSelect/NativeSelectInput.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, createClientRender, fireEvent } from 'test/utils';
 import NativeSelectInput from './NativeSelectInput';
 
 describe('<NativeSelectInput />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<NativeSelectInput IconComponent="div" />, () => ({
+  describeConformance(<NativeSelectInput IconComponent="div" />, () => ({
     only: ['refForwarding'],
     refInstanceof: window.HTMLSelectElement,
     muiName: 'MuiNativeSelectInput',
diff --git a/packages/material-ui/src/OutlinedInput/OutlinedInput.test.js b/packages/material-ui/src/OutlinedInput/OutlinedInput.test.js
index e6425c6119c2c8..55148a297926a5 100644
--- a/packages/material-ui/src/OutlinedInput/OutlinedInput.test.js
+++ b/packages/material-ui/src/OutlinedInput/OutlinedInput.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import OutlinedInput, { outlinedInputClasses as classes } from '@material-ui/core/OutlinedInput';
 import InputBase from '@material-ui/core/InputBase';
 
 describe('<OutlinedInput />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<OutlinedInput />, () => ({
+  describeConformance(<OutlinedInput />, () => ({
     classes,
     inheritComponent: InputBase,
     render,
diff --git a/packages/material-ui/src/Pagination/Pagination.test.js b/packages/material-ui/src/Pagination/Pagination.test.js
index 9d75995933d76d..df2e93bf788007 100644
--- a/packages/material-ui/src/Pagination/Pagination.test.js
+++ b/packages/material-ui/src/Pagination/Pagination.test.js
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import { createTheme, ThemeProvider } from '@material-ui/core/styles';
 import Pagination, { paginationClasses as classes } from '@material-ui/core/Pagination';
 
 describe('<Pagination />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Pagination />, () => ({
+  describeConformance(<Pagination />, () => ({
     classes,
     inheritComponent: 'nav',
     render,
diff --git a/packages/material-ui/src/PaginationItem/PaginationItem.test.js b/packages/material-ui/src/PaginationItem/PaginationItem.test.js
index 33eed6f70a94aa..30a70aee878192 100644
--- a/packages/material-ui/src/PaginationItem/PaginationItem.test.js
+++ b/packages/material-ui/src/PaginationItem/PaginationItem.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import PaginationItem, { paginationItemClasses as classes } from '@material-ui/core/PaginationItem';
 
 describe('<PaginationItem />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<PaginationItem />, () => ({
+  describeConformance(<PaginationItem />, () => ({
     classes,
     inheritComponent: 'button',
     render,
diff --git a/packages/material-ui/src/Paper/Paper.test.js b/packages/material-ui/src/Paper/Paper.test.js
index 37b2d617f6b7da..8946415d04ea49 100644
--- a/packages/material-ui/src/Paper/Paper.test.js
+++ b/packages/material-ui/src/Paper/Paper.test.js
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import PropTypes from 'prop-types';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Paper, { paperClasses as classes } from '@material-ui/core/Paper';
 import { createTheme, ThemeProvider } from '@material-ui/core/styles';
 
 describe('<Paper />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Paper />, () => ({
+  describeConformance(<Paper />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Popover/Popover.test.js b/packages/material-ui/src/Popover/Popover.test.js
index 531dbb78d84046..ab93bca769f8a5 100644
--- a/packages/material-ui/src/Popover/Popover.test.js
+++ b/packages/material-ui/src/Popover/Popover.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy, stub, useFakeTimers } from 'sinon';
-import { act, createMount, createClientRender, describeConformanceV5, screen } from 'test/utils';
+import { act, createMount, createClientRender, describeConformance, screen } from 'test/utils';
 import PropTypes from 'prop-types';
 import Grow from '@material-ui/core/Grow';
 import Modal from '@material-ui/core/Modal';
@@ -48,7 +48,7 @@ describe('<Popover />', () => {
   const mount = createMount();
   const render = createClientRender();
 
-  describeConformanceV5(<Popover anchorEl={() => document.createElement('div')} open />, () => ({
+  describeConformance(<Popover anchorEl={() => document.createElement('div')} open />, () => ({
     classes,
     inheritComponent: Modal,
     render,
diff --git a/packages/material-ui/src/Popper/Popper.test.js b/packages/material-ui/src/Popper/Popper.test.js
index 544fd8997908f0..6983dc572a0271 100644
--- a/packages/material-ui/src/Popper/Popper.test.js
+++ b/packages/material-ui/src/Popper/Popper.test.js
@@ -28,6 +28,10 @@ describe('<Popper />', () => {
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',
+      'componentsProp',
+      'themeDefaultProps',
+      'themeStyleOverrides',
+      'themeVariants',
       // https://github.com/facebook/react/issues/11565
       'reactTestRenderer',
     ],
diff --git a/packages/material-ui/src/Radio/Radio.test.js b/packages/material-ui/src/Radio/Radio.test.js
index d19e0b5d481649..3213fc862196ba 100644
--- a/packages/material-ui/src/Radio/Radio.test.js
+++ b/packages/material-ui/src/Radio/Radio.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import Radio, { radioClasses as classes } from '@material-ui/core/Radio';
 import FormControl from '@material-ui/core/FormControl';
 import ButtonBase from '@material-ui/core/ButtonBase';
@@ -8,7 +8,7 @@ import ButtonBase from '@material-ui/core/ButtonBase';
 describe('<Radio />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Radio />, () => ({
+  describeConformance(<Radio />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/RadioGroup/RadioGroup.test.js b/packages/material-ui/src/RadioGroup/RadioGroup.test.js
index 222b7db1b2b8f8..329d4a352a4286 100644
--- a/packages/material-ui/src/RadioGroup/RadioGroup.test.js
+++ b/packages/material-ui/src/RadioGroup/RadioGroup.test.js
@@ -14,7 +14,13 @@ describe('<RadioGroup />', () => {
     classes: {},
     inheritComponent: FormGroup,
     refInstanceof: window.HTMLDivElement,
-    skip: ['componentProp'],
+    skip: [
+      'componentProp',
+      'componentsProp',
+      'themeDefaultProps',
+      'themeStyleOverrides',
+      'themeVariants',
+    ],
   }));
 
   it('the root component has the radiogroup role', () => {
diff --git a/packages/material-ui/src/Rating/Rating.test.js b/packages/material-ui/src/Rating/Rating.test.js
index f4c40a002a7b03..8effd0f8a9ff88 100644
--- a/packages/material-ui/src/Rating/Rating.test.js
+++ b/packages/material-ui/src/Rating/Rating.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { stub, spy } from 'sinon';
-import { act, describeConformanceV5, createClientRender, fireEvent, screen } from 'test/utils';
+import { act, describeConformance, createClientRender, fireEvent, screen } from 'test/utils';
 import Rating, { ratingClasses as classes } from '@material-ui/core/Rating';
 
 describe('<Rating />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Rating />, () => ({
+  describeConformance(<Rating />, () => ({
     classes,
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui/src/ScopedCssBaseline/ScopedCssBaseline.test.js b/packages/material-ui/src/ScopedCssBaseline/ScopedCssBaseline.test.js
index 7cd99a3d6496f4..b158798ddff583 100644
--- a/packages/material-ui/src/ScopedCssBaseline/ScopedCssBaseline.test.js
+++ b/packages/material-ui/src/ScopedCssBaseline/ScopedCssBaseline.test.js
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import ScopedCssBaseline, {
   scopedCssBaselineClasses as classes,
 } from '@material-ui/core/ScopedCssBaseline';
@@ -7,7 +7,7 @@ import ScopedCssBaseline, {
 describe('<ScopedCssBaseline />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ScopedCssBaseline />, () => ({
+  describeConformance(<ScopedCssBaseline />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Select/Select.test.js b/packages/material-ui/src/Select/Select.test.js
index 6ff616136cad53..fa0b05474b47f1 100644
--- a/packages/material-ui/src/Select/Select.test.js
+++ b/packages/material-ui/src/Select/Select.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { expect } from 'chai';
 import { spy, stub, useFakeTimers } from 'sinon';
 import {
-  describeConformanceV5,
+  describeConformance,
   ErrorBoundary,
   act,
   createClientRender,
@@ -32,7 +32,7 @@ describe('<Select />', () => {
 
   const render = createClientRender();
 
-  describeConformanceV5(<Select value="" />, () => ({
+  describeConformance(<Select value="" />, () => ({
     classes,
     inheritComponent: OutlinedInput,
     render,
diff --git a/packages/material-ui/src/Skeleton/Skeleton.test.js b/packages/material-ui/src/Skeleton/Skeleton.test.js
index 11a2a9a3549ea3..476d944913868d 100644
--- a/packages/material-ui/src/Skeleton/Skeleton.test.js
+++ b/packages/material-ui/src/Skeleton/Skeleton.test.js
@@ -1,12 +1,12 @@
 import { expect } from 'chai';
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Skeleton, { skeletonClasses as classes } from '@material-ui/core/Skeleton';
 
 describe('<Skeleton />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Skeleton />, () => ({
+  describeConformance(<Skeleton />, () => ({
     classes,
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui/src/Slide/Slide.test.js b/packages/material-ui/src/Slide/Slide.test.js
index 5542517cbb4690..dacc524650d83c 100644
--- a/packages/material-ui/src/Slide/Slide.test.js
+++ b/packages/material-ui/src/Slide/Slide.test.js
@@ -27,6 +27,10 @@ describe('<Slide />', () => {
       refInstanceof: window.HTMLDivElement,
       skip: [
         'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
         // react-transition-group issue
         'reactTestRenderer',
       ],
diff --git a/packages/material-ui/src/Slider/Slider.test.js b/packages/material-ui/src/Slider/Slider.test.js
index f00ba1f365d73e..a1653ca7daae9b 100644
--- a/packages/material-ui/src/Slider/Slider.test.js
+++ b/packages/material-ui/src/Slider/Slider.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { spy, stub } from 'sinon';
 import { expect } from 'chai';
-import { describeConformanceV5, act, createClientRender, fireEvent, screen } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent, screen } from 'test/utils';
 import { ThemeProvider, createTheme } from '@material-ui/core/styles';
 import { SliderUnstyled } from '@material-ui/unstyled';
 import Slider, { sliderClasses as classes } from '@material-ui/core/Slider';
@@ -29,7 +29,7 @@ describe('<Slider />', () => {
 
   const render = createClientRender();
 
-  describeConformanceV5(<Slider value={0} />, () => ({
+  describeConformance(<Slider value={0} />, () => ({
     classes,
     inheritComponent: SliderUnstyled,
     render,
diff --git a/packages/material-ui/src/Snackbar/Snackbar.test.js b/packages/material-ui/src/Snackbar/Snackbar.test.js
index d2c456f0f398fc..12f6fc38ef6ecc 100644
--- a/packages/material-ui/src/Snackbar/Snackbar.test.js
+++ b/packages/material-ui/src/Snackbar/Snackbar.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy, useFakeTimers } from 'sinon';
-import { describeConformanceV5, act, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent } from 'test/utils';
 import Snackbar, { snackbarClasses as classes } from '@material-ui/core/Snackbar';
 
 describe('<Snackbar />', () => {
@@ -34,7 +34,7 @@ describe('<Snackbar />', () => {
     return result;
   }
 
-  describeConformanceV5(<Snackbar open message="message" />, () => ({
+  describeConformance(<Snackbar open message="message" />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/SnackbarContent/SnackbarContent.test.js b/packages/material-ui/src/SnackbarContent/SnackbarContent.test.js
index 74cda8f5621cc8..dc81ea4395a07a 100644
--- a/packages/material-ui/src/SnackbarContent/SnackbarContent.test.js
+++ b/packages/material-ui/src/SnackbarContent/SnackbarContent.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Paper from '@material-ui/core/Paper';
 import SnackbarContent, {
   snackbarContentClasses as classes,
@@ -9,7 +9,7 @@ import SnackbarContent, {
 describe('<SnackbarContent />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<SnackbarContent message="conform?" />, () => ({
+  describeConformance(<SnackbarContent message="conform?" />, () => ({
     classes,
     inheritComponent: Paper,
     render,
diff --git a/packages/material-ui/src/SpeedDial/SpeedDial.test.js b/packages/material-ui/src/SpeedDial/SpeedDial.test.js
index d38936ccd7e828..685147ed11027c 100644
--- a/packages/material-ui/src/SpeedDial/SpeedDial.test.js
+++ b/packages/material-ui/src/SpeedDial/SpeedDial.test.js
@@ -7,7 +7,7 @@ import {
   fireEvent,
   fireDiscreteEvent,
   screen,
-  describeConformanceV5,
+  describeConformance,
 } from 'test/utils';
 import Icon from '@material-ui/core/Icon';
 import SpeedDial, { speedDialClasses as classes } from '@material-ui/core/SpeedDial';
@@ -35,7 +35,7 @@ describe('<SpeedDial />', () => {
     ariaLabel: 'mySpeedDial',
   };
 
-  describeConformanceV5(<SpeedDial {...defaultProps} />, () => ({
+  describeConformance(<SpeedDial {...defaultProps} />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/SpeedDialAction/SpeedDialAction.test.js b/packages/material-ui/src/SpeedDialAction/SpeedDialAction.test.js
index fecf4514b5f0b9..7edcdb403bb995 100644
--- a/packages/material-ui/src/SpeedDialAction/SpeedDialAction.test.js
+++ b/packages/material-ui/src/SpeedDialAction/SpeedDialAction.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, act, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent } from 'test/utils';
 import { useFakeTimers } from 'sinon';
 import Icon from '@material-ui/core/Icon';
 import Tooltip from '@material-ui/core/Tooltip';
@@ -21,7 +21,7 @@ describe('<SpeedDialAction />', () => {
 
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <SpeedDialAction icon={<Icon>add</Icon>} tooltipTitle="placeholder" />,
     () => ({
       classes,
diff --git a/packages/material-ui/src/SpeedDialIcon/SpeedDialIcon.test.js b/packages/material-ui/src/SpeedDialIcon/SpeedDialIcon.test.js
index 905d28c3721fcc..5c768d3fcc347e 100644
--- a/packages/material-ui/src/SpeedDialIcon/SpeedDialIcon.test.js
+++ b/packages/material-ui/src/SpeedDialIcon/SpeedDialIcon.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Icon from '@material-ui/core/Icon';
 import SpeedDialIcon, { speedDialIconClasses as classes } from '@material-ui/core/SpeedDialIcon';
 
@@ -8,7 +8,7 @@ describe('<SpeedDialIcon />', () => {
   const render = createClientRender();
   const icon = <Icon>font_icon</Icon>;
 
-  describeConformanceV5(<SpeedDialIcon />, () => ({
+  describeConformance(<SpeedDialIcon />, () => ({
     classes,
     inheritComponent: 'span',
     render,
diff --git a/packages/material-ui/src/Stack/Stack.test.js b/packages/material-ui/src/Stack/Stack.test.js
index ee70a8e1c9324b..1a757f66dfbd12 100644
--- a/packages/material-ui/src/Stack/Stack.test.js
+++ b/packages/material-ui/src/Stack/Stack.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Stack from '@material-ui/core/Stack';
 import { createTheme } from '@material-ui/core/styles';
 import defaultTheme from '@material-ui/core/styles/defaultTheme';
@@ -9,7 +9,7 @@ import { style } from './Stack';
 describe('<Stack />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Stack />, () => ({
+  describeConformance(<Stack />, () => ({
     render,
     inheritComponent: 'div',
     refInstanceof: window.HTMLDivElement,
diff --git a/packages/material-ui/src/Step/Step.test.js b/packages/material-ui/src/Step/Step.test.js
index 7311154473e619..e69ea678522822 100644
--- a/packages/material-ui/src/Step/Step.test.js
+++ b/packages/material-ui/src/Step/Step.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Step, { stepClasses as classes } from '@material-ui/core/Step';
 import Stepper from '@material-ui/core/Stepper';
 import StepLabel, { stepLabelClasses } from '@material-ui/core/StepLabel';
@@ -9,7 +9,7 @@ import StepButton, { stepButtonClasses } from '@material-ui/core/StepButton';
 describe('<Step />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Step />, () => ({
+  describeConformance(<Step />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/StepButton/StepButton.test.js b/packages/material-ui/src/StepButton/StepButton.test.js
index 257e3db3c05abd..ea352fcb4d0a5d 100644
--- a/packages/material-ui/src/StepButton/StepButton.test.js
+++ b/packages/material-ui/src/StepButton/StepButton.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import { fireEvent } from '@testing-library/dom';
 import StepButton, { stepButtonClasses as classes } from '@material-ui/core/StepButton';
 import Step from '@material-ui/core/Step';
@@ -12,7 +12,7 @@ describe('<StepButton />', () => {
   const render = createClientRender();
 
   describe('internals', () => {
-    describeConformanceV5(<StepButton />, () => ({
+    describeConformance(<StepButton />, () => ({
       classes,
       inheritComponent: ButtonBase,
       muiName: 'MuiStepButton',
diff --git a/packages/material-ui/src/StepConnector/StepConnector.test.js b/packages/material-ui/src/StepConnector/StepConnector.test.js
index f3b595f40fc5cb..4a64f161caa225 100644
--- a/packages/material-ui/src/StepConnector/StepConnector.test.js
+++ b/packages/material-ui/src/StepConnector/StepConnector.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Stepper from '@material-ui/core/Stepper';
 import Step from '@material-ui/core/Step';
 import StepConnector, { stepConnectorClasses as classes } from '@material-ui/core/StepConnector';
@@ -8,7 +8,7 @@ import StepConnector, { stepConnectorClasses as classes } from '@material-ui/cor
 describe('<StepConnector />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<StepConnector />, () => ({
+  describeConformance(<StepConnector />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/StepContent/StepContent.test.js b/packages/material-ui/src/StepContent/StepContent.test.js
index a8f47c4fc30fac..d69852bc36cf3d 100644
--- a/packages/material-ui/src/StepContent/StepContent.test.js
+++ b/packages/material-ui/src/StepContent/StepContent.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import { collapseClasses } from '@material-ui/core/Collapse';
 import Stepper from '@material-ui/core/Stepper';
 import Step from '@material-ui/core/Step';
@@ -9,7 +9,7 @@ import StepContent, { stepContentClasses as classes } from '@material-ui/core/St
 describe('<StepContent />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<StepContent />, () => ({
+  describeConformance(<StepContent />, () => ({
     classes,
     inheritComponent: 'div',
     wrapMount: (mount) => (node) => {
diff --git a/packages/material-ui/src/StepIcon/StepIcon.test.js b/packages/material-ui/src/StepIcon/StepIcon.test.js
index 4605824efc4eff..c9345e8a61c711 100644
--- a/packages/material-ui/src/StepIcon/StepIcon.test.js
+++ b/packages/material-ui/src/StepIcon/StepIcon.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import StepIcon, { stepIconClasses as classes } from '@material-ui/core/StepIcon';
 
 describe('<StepIcon />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<StepIcon icon={1} />, () => ({
+  describeConformance(<StepIcon icon={1} />, () => ({
     classes,
     inheritComponent: 'svg',
     render,
diff --git a/packages/material-ui/src/StepLabel/StepLabel.test.js b/packages/material-ui/src/StepLabel/StepLabel.test.js
index 61fff11408f4b2..4c74a14df82c42 100644
--- a/packages/material-ui/src/StepLabel/StepLabel.test.js
+++ b/packages/material-ui/src/StepLabel/StepLabel.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Typography from '@material-ui/core/Typography';
 import Stepper from '@material-ui/core/Stepper';
 import Step from '@material-ui/core/Step';
@@ -10,7 +10,7 @@ import StepLabel, { stepLabelClasses as classes } from '@material-ui/core/StepLa
 describe('<StepLabel />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<StepLabel />, () => ({
+  describeConformance(<StepLabel />, () => ({
     classes,
     inheritComponent: 'span',
     muiName: 'MuiStepLabel',
diff --git a/packages/material-ui/src/Stepper/Stepper.test.tsx b/packages/material-ui/src/Stepper/Stepper.test.tsx
index f33878b643fb54..24023438b27f18 100644
--- a/packages/material-ui/src/Stepper/Stepper.test.tsx
+++ b/packages/material-ui/src/Stepper/Stepper.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Step, { StepProps, stepClasses } from '@material-ui/core/Step';
 import StepLabel from '@material-ui/core/StepLabel';
 import StepConnector, { stepConnectorClasses } from '@material-ui/core/StepConnector';
@@ -10,7 +10,7 @@ import Stepper, { stepperClasses as classes } from '@material-ui/core/Stepper';
 describe('<Stepper />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <Stepper>
       <Step />
     </Stepper>,
diff --git a/packages/material-ui/src/SvgIcon/SvgIcon.test.js b/packages/material-ui/src/SvgIcon/SvgIcon.test.js
index 5b1307b210a564..428ea46c523670 100644
--- a/packages/material-ui/src/SvgIcon/SvgIcon.test.js
+++ b/packages/material-ui/src/SvgIcon/SvgIcon.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import SvgIcon, { svgIconClasses as classes } from '@material-ui/core/SvgIcon';
 
 describe('<SvgIcon />', () => {
@@ -12,7 +12,7 @@ describe('<SvgIcon />', () => {
     path = <path d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" data-testid="test-path" />;
   });
 
-  describeConformanceV5(
+  describeConformance(
     <SvgIcon>
       <path />
     </SvgIcon>,
diff --git a/packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.test.js b/packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.test.js
index e72a7f27a9fbbe..f5e67cad54859c 100644
--- a/packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.test.js
+++ b/packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.test.js
@@ -77,6 +77,9 @@ describe('<SwipeableDrawer />', () => {
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',
+      'themeDefaultProps',
+      'themeStyleOverrides',
+      'themeVariants',
       // https://github.com/facebook/react/issues/11565
       'reactTestRenderer',
     ],
diff --git a/packages/material-ui/src/Switch/Switch.test.js b/packages/material-ui/src/Switch/Switch.test.js
index c69c81140a9c95..cfc789f1d7148c 100644
--- a/packages/material-ui/src/Switch/Switch.test.js
+++ b/packages/material-ui/src/Switch/Switch.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { describeConformanceV5, act, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent } from 'test/utils';
 import Switch, { switchClasses as classes } from '@material-ui/core/Switch';
 import FormControl from '@material-ui/core/FormControl';
 
 describe('<Switch />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Switch />, () => ({
+  describeConformance(<Switch />, () => ({
     classes,
     render,
     muiName: 'MuiSwitch',
diff --git a/packages/material-ui/src/Tab/Tab.test.js b/packages/material-ui/src/Tab/Tab.test.js
index f041d0f9b96222..86f0d8a0e7c461 100644
--- a/packages/material-ui/src/Tab/Tab.test.js
+++ b/packages/material-ui/src/Tab/Tab.test.js
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, act, createClientRender, fireEvent } from 'test/utils';
+import { describeConformance, act, createClientRender, fireEvent } from 'test/utils';
 import Tab, { tabClasses as classes } from '@material-ui/core/Tab';
 import ButtonBase from '@material-ui/core/ButtonBase';
 
 describe('<Tab />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Tab textColor="inherit" />, () => ({
+  describeConformance(<Tab textColor="inherit" />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/TabScrollButton/TabScrollButton.test.js b/packages/material-ui/src/TabScrollButton/TabScrollButton.test.js
index f521424afc3acc..51dc6299a23204 100644
--- a/packages/material-ui/src/TabScrollButton/TabScrollButton.test.js
+++ b/packages/material-ui/src/TabScrollButton/TabScrollButton.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TabScrollButton, {
   tabScrollButtonClasses as classes,
 } from '@material-ui/core/TabScrollButton';
@@ -12,7 +12,7 @@ describe('<TabScrollButton />', () => {
   };
   const render = createClientRender();
 
-  describeConformanceV5(<TabScrollButton {...defaultProps} />, () => ({
+  describeConformance(<TabScrollButton {...defaultProps} />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Table/Table.test.js b/packages/material-ui/src/Table/Table.test.js
index 82b77b737d02f0..2d0db05e6c5670 100644
--- a/packages/material-ui/src/Table/Table.test.js
+++ b/packages/material-ui/src/Table/Table.test.js
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Table, { tableClasses as classes } from '@material-ui/core/Table';
 import TableContext from './TableContext';
 
 describe('<Table />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <Table>
       <tbody />
     </Table>,
diff --git a/packages/material-ui/src/TableBody/TableBody.test.js b/packages/material-ui/src/TableBody/TableBody.test.js
index a3965581991b1f..35e3c659a96a5d 100644
--- a/packages/material-ui/src/TableBody/TableBody.test.js
+++ b/packages/material-ui/src/TableBody/TableBody.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TableBody, { tableBodyClasses as classes } from '@material-ui/core/TableBody';
 import Tablelvl2Context from '../Table/Tablelvl2Context';
 
@@ -11,7 +11,7 @@ describe('<TableBody />', () => {
     return render(<table>{node}</table>);
   }
 
-  describeConformanceV5(<TableBody />, () => ({
+  describeConformance(<TableBody />, () => ({
     classes,
     inheritComponent: 'tbody',
     wrapMount: (mount) => (node) => {
diff --git a/packages/material-ui/src/TableCell/TableCell.test.js b/packages/material-ui/src/TableCell/TableCell.test.js
index cac3452fd9a9f4..5636a8a2d397c4 100644
--- a/packages/material-ui/src/TableCell/TableCell.test.js
+++ b/packages/material-ui/src/TableCell/TableCell.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TableCell, { tableCellClasses as classes } from '@material-ui/core/TableCell';
 
 describe('<TableCell />', () => {
@@ -15,7 +15,7 @@ describe('<TableCell />', () => {
     );
   }
 
-  describeConformanceV5(<TableCell />, () => ({
+  describeConformance(<TableCell />, () => ({
     classes,
     inheritComponent: 'td',
     render: (node) => {
diff --git a/packages/material-ui/src/TableContainer/TableContainer.test.js b/packages/material-ui/src/TableContainer/TableContainer.test.js
index ff3c5811004013..f8f8d8d8bf10f8 100644
--- a/packages/material-ui/src/TableContainer/TableContainer.test.js
+++ b/packages/material-ui/src/TableContainer/TableContainer.test.js
@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TableContainer, { tableContainerClasses as classes } from '@material-ui/core/TableContainer';
 
 describe('<TableContainer />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TableContainer />, () => ({
+  describeConformance(<TableContainer />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/TableFooter/TableFooter.test.js b/packages/material-ui/src/TableFooter/TableFooter.test.js
index 0d401335339554..011e071c906d7c 100644
--- a/packages/material-ui/src/TableFooter/TableFooter.test.js
+++ b/packages/material-ui/src/TableFooter/TableFooter.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TableFooter, { tableFooterClasses as classes } from '@material-ui/core/TableFooter';
 import Tablelvl2Context from '../Table/Tablelvl2Context';
 
@@ -11,7 +11,7 @@ describe('<TableFooter />', () => {
     return render(<table>{node}</table>);
   }
 
-  describeConformanceV5(<TableFooter />, () => ({
+  describeConformance(<TableFooter />, () => ({
     classes,
     inheritComponent: 'tfoot',
     render: (node) => {
diff --git a/packages/material-ui/src/TableHead/TableHead.test.js b/packages/material-ui/src/TableHead/TableHead.test.js
index ed4e2075ed3251..8546a3a4e9147c 100644
--- a/packages/material-ui/src/TableHead/TableHead.test.js
+++ b/packages/material-ui/src/TableHead/TableHead.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TableHead, { tableHeadClasses as classes } from '@material-ui/core/TableHead';
 import Tablelvl2Context from '../Table/Tablelvl2Context';
 
@@ -10,7 +10,7 @@ describe('<TableHead />', () => {
     return render(<table>{node}</table>);
   }
 
-  describeConformanceV5(<TableHead />, () => ({
+  describeConformance(<TableHead />, () => ({
     classes,
     inheritComponent: 'thead',
     wrapMount: (mount) => (node) => {
diff --git a/packages/material-ui/src/TablePagination/TablePagination.test.js b/packages/material-ui/src/TablePagination/TablePagination.test.js
index c1c1da1a61290a..6bb78df2391ab7 100644
--- a/packages/material-ui/src/TablePagination/TablePagination.test.js
+++ b/packages/material-ui/src/TablePagination/TablePagination.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
 import PropTypes from 'prop-types';
-import { describeConformanceV5, fireEvent, createClientRender } from 'test/utils';
+import { describeConformance, fireEvent, createClientRender } from 'test/utils';
 import TableFooter from '@material-ui/core/TableFooter';
 import TableCell from '@material-ui/core/TableCell';
 import TableRow from '@material-ui/core/TableRow';
@@ -14,7 +14,7 @@ describe('<TablePagination />', () => {
   const noop = () => {};
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <TablePagination count={1} onPageChange={noop} page={0} rowsPerPage={10} />,
     () => ({
       classes,
diff --git a/packages/material-ui/src/TableRow/TableRow.test.js b/packages/material-ui/src/TableRow/TableRow.test.js
index b465e2b667d283..76344bb4e49fea 100644
--- a/packages/material-ui/src/TableRow/TableRow.test.js
+++ b/packages/material-ui/src/TableRow/TableRow.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import TableRow, { tableRowClasses as classes } from '@material-ui/core/TableRow';
 
 describe('<TableRow />', () => {
@@ -14,7 +14,7 @@ describe('<TableRow />', () => {
     );
   }
 
-  describeConformanceV5(<TableRow />, () => ({
+  describeConformance(<TableRow />, () => ({
     classes,
     inheritComponent: 'tr',
     render: (node) => {
diff --git a/packages/material-ui/src/TableSortLabel/TableSortLabel.test.js b/packages/material-ui/src/TableSortLabel/TableSortLabel.test.js
index 35e6e0a3a477e7..a07e856cc45791 100644
--- a/packages/material-ui/src/TableSortLabel/TableSortLabel.test.js
+++ b/packages/material-ui/src/TableSortLabel/TableSortLabel.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import SortIcon from '@material-ui/icons/Sort';
 import TableSortLabel, { tableSortLabelClasses as classes } from '@material-ui/core/TableSortLabel';
 import ButtonBase from '@material-ui/core/ButtonBase';
@@ -8,7 +8,7 @@ import ButtonBase from '@material-ui/core/ButtonBase';
 describe('<TableSortLabel />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TableSortLabel />, () => ({
+  describeConformance(<TableSortLabel />, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/Tabs/Tabs.test.js b/packages/material-ui/src/Tabs/Tabs.test.js
index 32d915f1cd8542..34453fd7e395fd 100644
--- a/packages/material-ui/src/Tabs/Tabs.test.js
+++ b/packages/material-ui/src/Tabs/Tabs.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { expect } from 'chai';
 import { spy, useFakeTimers } from 'sinon';
 import {
-  describeConformanceV5,
+  describeConformance,
   act,
   createClientRender,
   fireEvent,
@@ -56,7 +56,7 @@ describe('<Tabs />', () => {
     }
   });
 
-  describeConformanceV5(<Tabs value={0} />, () => ({
+  describeConformance(<Tabs value={0} />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/TextField/TextField.test.js b/packages/material-ui/src/TextField/TextField.test.js
index 9b2d2418224aa8..68e4714a521d3d 100644
--- a/packages/material-ui/src/TextField/TextField.test.js
+++ b/packages/material-ui/src/TextField/TextField.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import FormControl from '@material-ui/core/FormControl';
 import { inputBaseClasses } from '@material-ui/core/InputBase';
 import MenuItem from '@material-ui/core/MenuItem';
@@ -10,7 +10,7 @@ import TextField, { textFieldClasses as classes } from '@material-ui/core/TextFi
 describe('<TextField />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<TextField variant="standard" />, () => ({
+  describeConformance(<TextField variant="standard" />, () => ({
     classes,
     inheritComponent: FormControl,
     render,
diff --git a/packages/material-ui/src/TextareaAutosize/TextareaAutosize.test.js b/packages/material-ui/src/TextareaAutosize/TextareaAutosize.test.js
index d070e22655f70c..e98dc48500b00e 100644
--- a/packages/material-ui/src/TextareaAutosize/TextareaAutosize.test.js
+++ b/packages/material-ui/src/TextareaAutosize/TextareaAutosize.test.js
@@ -10,7 +10,14 @@ describe('<TextareaAutosize />', () => {
   describeConformance(<TextareaAutosize />, () => ({
     inheritComponent: 'textarea',
     refInstanceof: window.HTMLTextAreaElement,
-    skip: ['rootClass', 'componentProp'],
+    skip: [
+      'rootClass',
+      'componentProp',
+      'componentsProp',
+      'themeDefaultProps',
+      'themeStyleOverrides',
+      'themeVariants',
+    ],
   }));
 
   describe('layout', () => {
diff --git a/packages/material-ui/src/ToggleButton/ToggleButton.test.js b/packages/material-ui/src/ToggleButton/ToggleButton.test.js
index 9eda6fd768693d..1d05b03f8810b0 100644
--- a/packages/material-ui/src/ToggleButton/ToggleButton.test.js
+++ b/packages/material-ui/src/ToggleButton/ToggleButton.test.js
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { createClientRender, describeConformanceV5, createServerRender } from 'test/utils';
+import { createClientRender, describeConformance, createServerRender } from 'test/utils';
 import ToggleButton, { toggleButtonClasses as classes } from '@material-ui/core/ToggleButton';
 import ButtonBase from '@material-ui/core/ButtonBase';
 
 describe('<ToggleButton />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ToggleButton value="X">Hello, World!</ToggleButton>, () => ({
+  describeConformance(<ToggleButton value="X">Hello, World!</ToggleButton>, () => ({
     classes,
     inheritComponent: ButtonBase,
     render,
diff --git a/packages/material-ui/src/ToggleButtonGroup/ToggleButtonGroup.test.js b/packages/material-ui/src/ToggleButtonGroup/ToggleButtonGroup.test.js
index 8d05c52228418a..cb2c79d9a1c411 100644
--- a/packages/material-ui/src/ToggleButtonGroup/ToggleButtonGroup.test.js
+++ b/packages/material-ui/src/ToggleButtonGroup/ToggleButtonGroup.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, createClientRender } from 'test/utils';
+import { describeConformance, createClientRender } from 'test/utils';
 import ToggleButtonGroup, {
   toggleButtonGroupClasses as classes,
 } from '@material-ui/core/ToggleButtonGroup';
@@ -10,7 +10,7 @@ import ToggleButton from '@material-ui/core/ToggleButton';
 describe('<ToggleButtonGroup />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<ToggleButtonGroup />, () => ({
+  describeConformance(<ToggleButtonGroup />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Toolbar/Toolbar.test.js b/packages/material-ui/src/Toolbar/Toolbar.test.js
index 8e316e87dff2e9..356da5c57150f7 100644
--- a/packages/material-ui/src/Toolbar/Toolbar.test.js
+++ b/packages/material-ui/src/Toolbar/Toolbar.test.js
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Toolbar, { toolbarClasses as classes } from '@material-ui/core/Toolbar';
 
 describe('<Toolbar />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Toolbar />, () => ({
+  describeConformance(<Toolbar />, () => ({
     classes,
     inheritComponent: 'div',
     render,
diff --git a/packages/material-ui/src/Tooltip/Tooltip.test.js b/packages/material-ui/src/Tooltip/Tooltip.test.js
index 8bf2760d4444a8..b165fb7e6dd95f 100644
--- a/packages/material-ui/src/Tooltip/Tooltip.test.js
+++ b/packages/material-ui/src/Tooltip/Tooltip.test.js
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { expect } from 'chai';
 import { spy, useFakeTimers } from 'sinon';
 import {
-  describeConformanceV5,
+  describeConformance,
   act,
   createClientRender,
   fireEvent,
@@ -46,7 +46,7 @@ describe('<Tooltip />', () => {
 
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <Tooltip title="Hello World" open>
       <button type="submit">Hello World</button>
     </Tooltip>,
diff --git a/packages/material-ui/src/Typography/Typography.test.js b/packages/material-ui/src/Typography/Typography.test.js
index d29f21784aab4b..01ef063bb3f334 100644
--- a/packages/material-ui/src/Typography/Typography.test.js
+++ b/packages/material-ui/src/Typography/Typography.test.js
@@ -1,13 +1,13 @@
 // @ts-check
 import * as React from 'react';
 import { expect } from 'chai';
-import { createClientRender, describeConformanceV5 } from 'test/utils';
+import { createClientRender, describeConformance } from 'test/utils';
 import Typography, { typographyClasses as classes } from '@material-ui/core/Typography';
 
 describe('<Typography />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(<Typography />, () => ({
+  describeConformance(<Typography />, () => ({
     classes,
     inheritComponent: 'p',
     render,
diff --git a/packages/material-ui/src/Zoom/Zoom.test.js b/packages/material-ui/src/Zoom/Zoom.test.js
index ebe72d7f12d1f4..91144b4c1492b9 100644
--- a/packages/material-ui/src/Zoom/Zoom.test.js
+++ b/packages/material-ui/src/Zoom/Zoom.test.js
@@ -18,6 +18,10 @@ describe('<Zoom />', () => {
       refInstanceof: window.HTMLDivElement,
       skip: [
         'componentProp',
+        'componentsProp',
+        'themeDefaultProps',
+        'themeStyleOverrides',
+        'themeVariants',
         // react-transition-group issue
         'reactTestRenderer',
       ],
diff --git a/packages/material-ui/src/internal/SwitchBase.test.js b/packages/material-ui/src/internal/SwitchBase.test.js
index e0d41892402b06..a768123d3d4296 100644
--- a/packages/material-ui/src/internal/SwitchBase.test.js
+++ b/packages/material-ui/src/internal/SwitchBase.test.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { describeConformanceV5, act, createClientRender } from 'test/utils';
+import { describeConformance, act, createClientRender } from 'test/utils';
 import SwitchBase from './SwitchBase';
 import FormControl, { useFormControl } from '../FormControl';
 import ButtonBase from '../ButtonBase';
@@ -10,7 +10,7 @@ import classes from './switchBaseClasses';
 describe('<SwitchBase />', () => {
   const render = createClientRender();
 
-  describeConformanceV5(
+  describeConformance(
     <SwitchBase checkedIcon="checked" icon="unchecked" type="checkbox" />,
     () => ({
       classes,
diff --git a/test/utils/describeConformance.js b/test/utils/describeConformance.js
index a5179567091bac..bd515c34bc7640 100644
--- a/test/utils/describeConformance.js
+++ b/test/utils/describeConformance.js
@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 import { expect } from 'chai';
 import * as React from 'react';
+import { ThemeProvider, createTheme } from '@material-ui/core/styles';
 import ReactTestRenderer from 'react-test-renderer';
 import createMount from './createMount';
 import findOutermostIntrinsic from './findOutermostIntrinsic';
@@ -192,28 +193,342 @@ export function testReactTestRenderer(element) {
   });
 }
 
-const fullSuite = {
-  componentProp: testComponentProp,
-  mergeClassName: testClassName,
-  propsSpread: testPropsSpread,
-  refForwarding: describeRef,
-  rootClass: testRootClass,
-  reactTestRenderer: testReactTestRenderer,
-};
-
 /**
  * @typedef {Object} ConformanceOptions
  * @property {() => void} [after]
- * @property {Record<string, string>} classes - `classes` of the component provided by `@material-ui/styles`
+ * @property {object} classes - `classes` of the component provided by `@material-ui/styled-engine`
  * @property {import('react').ElementType} [inheritComponent] - The element type that receives spread props or `undefined` if props are not spread.
+ * @property {string} muiName
+ * @property {(node: React.ReactElement) => import('./createClientRender').MuiRenderResult} [render] - Should be a return value from createClientRender
  * @property {Array<keyof typeof fullSuite>} [only] - If specified only run the tests listed
  * @property {any} refInstanceof - `ref` will be an instanceof this constructor.
  * @property {Array<keyof typeof fullSuite>} [skip] - Skip the specified tests
- * @property {string} [testComponentPropWith] - The host component that should be rendered instead.
+ * @property {string} [testComponentsRootPropWith] - The host component that should be rendered instead.
+ * @property {{ slotName: string, slotClassName: string }} [testDeepOverrides]
+ * @property {{ prop?: string, value?: any, styleKey: string }} [testStateOverrides]
+ * @property {object} [testVariantProps]
  * @property {(mount: (node: React.ReactNode) => import('enzyme').ReactWrapper) => (node: React.ReactNode) => import('enzyme').ReactWrapper} [wrapMount] - You can use this option to mount the component with enzyme in a WrapperComponent. Make sure the returned node corresponds to the input node and not the wrapper component.
- * @property {(node: React.ReactElement) => import('./createClientRender').MuiRenderResult} [render] - Should be a return value from createClientRender
  */
 
+function throwMissingPropError(field) {
+  throw new Error(`missing "${field}" in options
+
+  > describeConformance(element, () => options)
+`);
+}
+
+/**
+ * Material-UI components have a `components` prop that allows rendering a different
+ * Components from @inheritComponent
+ * @param {React.ReactElement} element
+ * @param {() => ConformanceOptions} getOptions
+ */
+function testComponentsProp(element, getOptions) {
+  describe('prop components:', () => {
+    it('can render another root component with the `components` prop', () => {
+      const { mount, testComponentsRootPropWith: component = 'em' } = getOptions();
+
+      const wrapper = mount(React.cloneElement(element, { components: { Root: component } }));
+
+      expect(findRootComponent(wrapper, { component }).exists()).to.equal(true);
+    });
+  });
+}
+
+/**
+ * Material-UI theme has a components section that allows specifying default props.
+ * Components from @inheritComponent
+ * @param {React.ReactElement} element
+ * @param {() => ConformanceOptions} getOptions
+ */
+function testThemeDefaultProps(element, getOptions) {
+  describe('theme default components:', () => {
+    it("respect theme's defaultProps", () => {
+      const testProp = 'data-id';
+      const { muiName, render } = getOptions();
+
+      if (!muiName) {
+        throwMissingPropError('muiName');
+      }
+
+      if (!render) {
+        throwMissingPropError('render');
+      }
+
+      const theme = createTheme({
+        components: {
+          [muiName]: {
+            defaultProps: {
+              [testProp]: 'testProp',
+            },
+          },
+        },
+      });
+
+      const { container } = render(<ThemeProvider theme={theme}>{element}</ThemeProvider>);
+
+      expect(container.firstChild).to.have.attribute(testProp, 'testProp');
+    });
+  });
+}
+
+/**
+ * Material-UI theme has a components section that allows specifying style overrides.
+ * Components from @inheritComponent
+ * @param {React.ReactElement} element
+ * @param {() => ConformanceOptions} getOptions
+ */
+function testThemeStyleOverrides(element, getOptions) {
+  describe('theme style overrides:', () => {
+    it("respect theme's styleOverrides custom state", function test() {
+      if (/jsdom/.test(window.navigator.userAgent)) {
+        this.skip();
+      }
+      const { muiName, testStateOverrides, render } = getOptions();
+
+      if (!testStateOverrides) {
+        return;
+      }
+
+      if (!muiName) {
+        throwMissingPropError('muiName');
+      }
+
+      if (!render) {
+        throwMissingPropError('render');
+      }
+
+      const testStyle = {
+        marginTop: '13px',
+      };
+
+      const theme = createTheme({
+        components: {
+          [muiName]: {
+            styleOverrides: {
+              [testStateOverrides.styleKey]: testStyle,
+            },
+          },
+        },
+      });
+
+      const { container } = render(
+        <ThemeProvider theme={theme}>
+          {React.cloneElement(element, {
+            [testStateOverrides.prop]: testStateOverrides.value,
+          })}
+        </ThemeProvider>,
+      );
+
+      expect(container.firstChild).to.toHaveComputedStyle(testStyle);
+    });
+
+    it("respect theme's styleOverrides slots", function test() {
+      if (/jsdom/.test(window.navigator.userAgent)) {
+        this.skip();
+      }
+
+      const {
+        muiName,
+        testDeepOverrides,
+        testRootOverrides = { slotName: 'root' },
+        render,
+      } = getOptions();
+
+      const testStyle = {
+        mixBlendMode: 'darken',
+      };
+
+      const theme = createTheme({
+        components: {
+          [muiName]: {
+            styleOverrides: {
+              [testRootOverrides.slotName]: {
+                ...testStyle,
+                ...(testDeepOverrides && {
+                  [`& .${testDeepOverrides.slotClassName}`]: {
+                    fontVariantCaps: 'all-petite-caps',
+                  },
+                }),
+              },
+              ...(testDeepOverrides && {
+                [testDeepOverrides.slotName]: {
+                  mixBlendMode: 'darken',
+                },
+              }),
+            },
+          },
+        },
+      });
+
+      const { container, setProps } = render(
+        <ThemeProvider theme={theme}>{element}</ThemeProvider>,
+      );
+
+      if (testRootOverrides.slotClassName) {
+        expect(
+          document.querySelector(`.${testRootOverrides.slotClassName}`),
+        ).to.toHaveComputedStyle(testStyle);
+      } else {
+        expect(container.firstChild).to.toHaveComputedStyle(testStyle);
+      }
+
+      if (testDeepOverrides) {
+        expect(
+          document.querySelector(`.${testDeepOverrides.slotClassName}`),
+        ).to.toHaveComputedStyle({
+          fontVariantCaps: 'all-petite-caps',
+          mixBlendMode: 'darken',
+        });
+
+        const themeWithoutRootOverrides = createTheme({
+          components: {
+            [muiName]: {
+              styleOverrides: {
+                ...(testDeepOverrides && {
+                  [testDeepOverrides.slotName]: testStyle,
+                }),
+              },
+            },
+          },
+        });
+
+        setProps({ theme: themeWithoutRootOverrides });
+        expect(
+          document.querySelector(`.${testDeepOverrides.slotClassName}`),
+        ).to.toHaveComputedStyle(testStyle);
+      }
+    });
+
+    it('overrideStyles does not replace each other in slots', function test() {
+      if (/jsdom/.test(window.navigator.userAgent)) {
+        this.skip();
+      }
+
+      const { muiName, classes, testStateOverrides, render } = getOptions();
+
+      const classKeys = Object.keys(classes);
+
+      // only test the component that has `root` and other classKey
+      if (!testStateOverrides || !classKeys.includes('root') || classKeys.length === 1) {
+        return;
+      }
+
+      // `styleKey` in some tests is `foo` or `bar`, so need to check if it is a valid classKey.
+      const isStyleKeyExists = classKeys.indexOf(testStateOverrides.styleKey) !== -1;
+
+      if (!isStyleKeyExists) {
+        return;
+      }
+
+      const theme = createTheme({
+        components: {
+          [muiName]: {
+            styleOverrides: {
+              root: {
+                [`&.${classes.root}`]: {
+                  filter: 'blur(1px)',
+                  mixBlendMode: 'darken',
+                },
+              },
+              ...(testStateOverrides && {
+                [testStateOverrides.styleKey]: {
+                  [`&.${classes.root}`]: {
+                    mixBlendMode: 'color',
+                  },
+                },
+              }),
+            },
+          },
+        },
+      });
+
+      render(
+        <ThemeProvider theme={theme}>
+          {React.cloneElement(element, {
+            [testStateOverrides.prop]: testStateOverrides.value,
+          })}
+        </ThemeProvider>,
+      );
+
+      expect(document.querySelector(`.${classes.root}`)).toHaveComputedStyle({
+        filter: 'blur(1px)', // still valid in root
+        mixBlendMode: 'color', // overridden by `styleKey`
+      });
+    });
+  });
+}
+
+/**
+ * Material-UI theme has a components section that allows specifying custom variants.
+ * Components from @inheritComponent
+ * @param {React.ReactElement} element
+ * @param {() => ConformanceOptions} getOptions
+ */
+function testThemeVariants(element, getOptions) {
+  describe('theme variants:', () => {
+    it("respect theme's variants", function test() {
+      if (/jsdom/.test(window.navigator.userAgent)) {
+        this.skip();
+      }
+
+      const { muiName, testVariantProps, render } = getOptions();
+
+      if (!testVariantProps) {
+        throw new Error('missing testVariantProps');
+      }
+
+      if (!muiName) {
+        throwMissingPropError('muiName');
+      }
+
+      if (!render) {
+        throwMissingPropError('render');
+      }
+
+      const testStyle = {
+        marginTop: '13px',
+      };
+
+      const theme = createTheme({
+        components: {
+          [muiName]: {
+            variants: [
+              {
+                props: testVariantProps,
+                style: testStyle,
+              },
+            ],
+          },
+        },
+      });
+
+      const { getByTestId } = render(
+        <ThemeProvider theme={theme}>
+          {React.cloneElement(element, { ...testVariantProps, 'data-testid': 'with-props' })}
+          {React.cloneElement(element, { 'data-testid': 'without-props' })}
+        </ThemeProvider>,
+      );
+
+      expect(getByTestId('with-props')).to.toHaveComputedStyle(testStyle);
+      expect(getByTestId('without-props')).not.to.toHaveComputedStyle(testStyle);
+    });
+  });
+}
+
+const fullSuite = {
+  componentProp: testComponentProp,
+  componentsProp: testComponentsProp,
+  mergeClassName: testClassName,
+  propsSpread: testPropsSpread,
+  refForwarding: describeRef,
+  rootClass: testRootClass,
+  reactTestRenderer: testReactTestRenderer,
+  themeDefaultProps: testThemeDefaultProps,
+  themeStyleOverrides: testThemeStyleOverrides,
+  themeVariants: testThemeVariants,
+};
+
 /**
  * Tests various aspects of a component that should be equal across Material-UI
  * components.
@@ -226,11 +541,15 @@ export default function describeConformance(minimalElement, getOptions) {
       after: runAfterHook = () => {},
       only = Object.keys(fullSuite),
       skip = [],
-      wrapMount = (mount) => mount,
+      wrapMount,
     } = getOptions();
 
+    const filteredTests = Object.keys(fullSuite).filter(
+      (testKey) => only.indexOf(testKey) !== -1 && skip.indexOf(testKey) === -1,
+    );
+
     const baseMount = createMount();
-    const mount = wrapMount(baseMount);
+    const mount = wrapMount !== undefined ? wrapMount(baseMount) : baseMount;
 
     after(runAfterHook);
 
@@ -241,11 +560,9 @@ export default function describeConformance(minimalElement, getOptions) {
       };
     }
 
-    Object.keys(fullSuite)
-      .filter((testKey) => only.indexOf(testKey) !== -1 && skip.indexOf(testKey) === -1)
-      .forEach((testKey) => {
-        const test = fullSuite[testKey];
-        test(minimalElement, getTestOptions);
-      });
+    filteredTests.forEach((testKey) => {
+      const test = fullSuite[testKey];
+      test(minimalElement, getTestOptions);
+    });
   });
 }
diff --git a/test/utils/describeConformanceV5.js b/test/utils/describeConformanceV5.js
deleted file mode 100644
index a8b1865def9505..00000000000000
--- a/test/utils/describeConformanceV5.js
+++ /dev/null
@@ -1,388 +0,0 @@
-/* eslint-env mocha */
-import { expect } from 'chai';
-import * as React from 'react';
-import { ThemeProvider, createTheme } from '@material-ui/core/styles';
-import {
-  testComponentProp,
-  testClassName,
-  testPropsSpread,
-  describeRef,
-  findRootComponent,
-  testReactTestRenderer,
-  testRootClass,
-} from './describeConformance';
-import createMount from './createMount';
-
-/**
- * @typedef {Object} ConformanceOptions
- * @property {() => void} [after]
- * @property {object} classes - `classes` of the component provided by `@material-ui/styled-engine`
- * @property {import('react').ElementType} [inheritComponent] - The element type that receives spread props or `undefined` if props are not spread.
- * @property {string} muiName
- * @property {(node: React.ReactElement) => import('./createClientRender').MuiRenderResult} [render] - Should be a return value from createClientRender
- * @property {Array<keyof typeof fullSuite>} [only] - If specified only run the tests listed
- * @property {any} refInstanceof - `ref` will be an instanceof this constructor.
- * @property {Array<keyof typeof fullSuite>} [skip] - Skip the specified tests
- * @property {string} [testComponentsRootPropWith] - The host component that should be rendered instead.
- * @property {{ slotName: string, slotClassName: string }} [testDeepOverrides]
- * @property {{ prop?: string, value?: any, styleKey: string }} [testStateOverrides]
- * @property {object} [testVariantProps]
- * @property {(mount: (node: React.ReactNode) => import('enzyme').ReactWrapper) => (node: React.ReactNode) => import('enzyme').ReactWrapper} [wrapMount] - You can use this option to mount the component with enzyme in a WrapperComponent. Make sure the returned node corresponds to the input node and not the wrapper component.
- */
-
-function throwMissingPropError(field) {
-  throw new Error(`missing "${field}" in options
-
-  > describeConformanceV5(element, () => options)
-`);
-}
-
-/**
- * Material-UI components have a `components` prop that allows rendering a different
- * Components from @inheritComponent
- * @param {React.ReactElement} element
- * @param {() => ConformanceOptions} getOptions
- */
-function testComponentsProp(element, getOptions) {
-  describe('prop components:', () => {
-    it('can render another root component with the `components` prop', () => {
-      const { mount, testComponentsRootPropWith: component = 'em' } = getOptions();
-
-      const wrapper = mount(React.cloneElement(element, { components: { Root: component } }));
-
-      expect(findRootComponent(wrapper, { component }).exists()).to.equal(true);
-    });
-  });
-}
-
-/**
- * Material-UI theme has a components section that allows specifying default props.
- * Components from @inheritComponent
- * @param {React.ReactElement} element
- * @param {() => ConformanceOptions} getOptions
- */
-function testThemeDefaultProps(element, getOptions) {
-  describe('theme default components:', () => {
-    it("respect theme's defaultProps", () => {
-      const testProp = 'data-id';
-      const { muiName, render } = getOptions();
-
-      if (!muiName) {
-        throwMissingPropError('muiName');
-      }
-
-      if (!render) {
-        throwMissingPropError('render');
-      }
-
-      const theme = createTheme({
-        components: {
-          [muiName]: {
-            defaultProps: {
-              [testProp]: 'testProp',
-            },
-          },
-        },
-      });
-
-      const { container } = render(<ThemeProvider theme={theme}>{element}</ThemeProvider>);
-
-      expect(container.firstChild).to.have.attribute(testProp, 'testProp');
-    });
-  });
-}
-
-/**
- * Material-UI theme has a components section that allows specifying style overrides.
- * Components from @inheritComponent
- * @param {React.ReactElement} element
- * @param {() => ConformanceOptions} getOptions
- */
-function testThemeStyleOverrides(element, getOptions) {
-  describe('theme style overrides:', () => {
-    it("respect theme's styleOverrides custom state", function test() {
-      if (/jsdom/.test(window.navigator.userAgent)) {
-        this.skip();
-      }
-      const { muiName, testStateOverrides, render } = getOptions();
-
-      if (!testStateOverrides) {
-        return;
-      }
-
-      if (!muiName) {
-        throwMissingPropError('muiName');
-      }
-
-      if (!render) {
-        throwMissingPropError('render');
-      }
-
-      const testStyle = {
-        marginTop: '13px',
-      };
-
-      const theme = createTheme({
-        components: {
-          [muiName]: {
-            styleOverrides: {
-              [testStateOverrides.styleKey]: testStyle,
-            },
-          },
-        },
-      });
-
-      const { container } = render(
-        <ThemeProvider theme={theme}>
-          {React.cloneElement(element, {
-            [testStateOverrides.prop]: testStateOverrides.value,
-          })}
-        </ThemeProvider>,
-      );
-
-      expect(container.firstChild).to.toHaveComputedStyle(testStyle);
-    });
-
-    it("respect theme's styleOverrides slots", function test() {
-      if (/jsdom/.test(window.navigator.userAgent)) {
-        this.skip();
-      }
-
-      const {
-        muiName,
-        testDeepOverrides,
-        testRootOverrides = { slotName: 'root' },
-        render,
-      } = getOptions();
-
-      const testStyle = {
-        mixBlendMode: 'darken',
-      };
-
-      const theme = createTheme({
-        components: {
-          [muiName]: {
-            styleOverrides: {
-              [testRootOverrides.slotName]: {
-                ...testStyle,
-                ...(testDeepOverrides && {
-                  [`& .${testDeepOverrides.slotClassName}`]: {
-                    fontVariantCaps: 'all-petite-caps',
-                  },
-                }),
-              },
-              ...(testDeepOverrides && {
-                [testDeepOverrides.slotName]: {
-                  mixBlendMode: 'darken',
-                },
-              }),
-            },
-          },
-        },
-      });
-
-      const { container, setProps } = render(
-        <ThemeProvider theme={theme}>{element}</ThemeProvider>,
-      );
-
-      if (testRootOverrides.slotClassName) {
-        expect(
-          document.querySelector(`.${testRootOverrides.slotClassName}`),
-        ).to.toHaveComputedStyle(testStyle);
-      } else {
-        expect(container.firstChild).to.toHaveComputedStyle(testStyle);
-      }
-
-      if (testDeepOverrides) {
-        expect(
-          document.querySelector(`.${testDeepOverrides.slotClassName}`),
-        ).to.toHaveComputedStyle({
-          fontVariantCaps: 'all-petite-caps',
-          mixBlendMode: 'darken',
-        });
-
-        const themeWithoutRootOverrides = createTheme({
-          components: {
-            [muiName]: {
-              styleOverrides: {
-                ...(testDeepOverrides && {
-                  [testDeepOverrides.slotName]: testStyle,
-                }),
-              },
-            },
-          },
-        });
-
-        setProps({ theme: themeWithoutRootOverrides });
-        expect(
-          document.querySelector(`.${testDeepOverrides.slotClassName}`),
-        ).to.toHaveComputedStyle(testStyle);
-      }
-    });
-
-    it('overrideStyles does not replace each other in slots', function test() {
-      if (/jsdom/.test(window.navigator.userAgent)) {
-        this.skip();
-      }
-
-      const { muiName, classes, testStateOverrides, render } = getOptions();
-
-      const classKeys = Object.keys(classes);
-
-      // only test the component that has `root` and other classKey
-      if (!testStateOverrides || !classKeys.includes('root') || classKeys.length === 1) {
-        return;
-      }
-
-      // `styleKey` in some tests is `foo` or `bar`, so need to check if it is a valid classKey.
-      const isStyleKeyExists = classKeys.indexOf(testStateOverrides.styleKey) !== -1;
-
-      if (!isStyleKeyExists) {
-        return;
-      }
-
-      const theme = createTheme({
-        components: {
-          [muiName]: {
-            styleOverrides: {
-              root: {
-                [`&.${classes.root}`]: {
-                  filter: 'blur(1px)',
-                  mixBlendMode: 'darken',
-                },
-              },
-              ...(testStateOverrides && {
-                [testStateOverrides.styleKey]: {
-                  [`&.${classes.root}`]: {
-                    mixBlendMode: 'color',
-                  },
-                },
-              }),
-            },
-          },
-        },
-      });
-
-      render(
-        <ThemeProvider theme={theme}>
-          {React.cloneElement(element, {
-            [testStateOverrides.prop]: testStateOverrides.value,
-          })}
-        </ThemeProvider>,
-      );
-
-      expect(document.querySelector(`.${classes.root}`)).toHaveComputedStyle({
-        filter: 'blur(1px)', // still valid in root
-        mixBlendMode: 'color', // overridden by `styleKey`
-      });
-    });
-  });
-}
-
-/**
- * Material-UI theme has a components section that allows specifying custom variants.
- * Components from @inheritComponent
- * @param {React.ReactElement} element
- * @param {() => ConformanceOptions} getOptions
- */
-function testThemeVariants(element, getOptions) {
-  describe('theme variants:', () => {
-    it("respect theme's variants", function test() {
-      if (/jsdom/.test(window.navigator.userAgent)) {
-        this.skip();
-      }
-
-      const { muiName, testVariantProps, render } = getOptions();
-
-      if (!testVariantProps) {
-        throw new Error('missing testVariantProps');
-      }
-
-      if (!muiName) {
-        throwMissingPropError('muiName');
-      }
-
-      if (!render) {
-        throwMissingPropError('render');
-      }
-
-      const testStyle = {
-        marginTop: '13px',
-      };
-
-      const theme = createTheme({
-        components: {
-          [muiName]: {
-            variants: [
-              {
-                props: testVariantProps,
-                style: testStyle,
-              },
-            ],
-          },
-        },
-      });
-
-      const { getByTestId } = render(
-        <ThemeProvider theme={theme}>
-          {React.cloneElement(element, { ...testVariantProps, 'data-testid': 'with-props' })}
-          {React.cloneElement(element, { 'data-testid': 'without-props' })}
-        </ThemeProvider>,
-      );
-
-      expect(getByTestId('with-props')).to.toHaveComputedStyle(testStyle);
-      expect(getByTestId('without-props')).not.to.toHaveComputedStyle(testStyle);
-    });
-  });
-}
-
-const fullSuite = {
-  componentProp: testComponentProp,
-  componentsProp: testComponentsProp,
-  mergeClassName: testClassName,
-  propsSpread: testPropsSpread,
-  refForwarding: describeRef,
-  rootClass: testRootClass,
-  reactTestRenderer: testReactTestRenderer,
-  themeDefaultProps: testThemeDefaultProps,
-  themeStyleOverrides: testThemeStyleOverrides,
-  themeVariants: testThemeVariants,
-};
-
-/**
- * Tests various aspects of a component that should be equal across Material-UI
- * components.
- * @param {React.ReactElement} minimalElement - the component with it's minimal required props
- * @param {() => ConformanceOptions} getOptions
- */
-export default function describeConformanceV5(minimalElement, getOptions) {
-  describe('Material-UI component API', () => {
-    const {
-      after: runAfterHook = () => {},
-      only = Object.keys(fullSuite),
-      skip = [],
-      wrapMount,
-    } = getOptions();
-
-    const filteredTests = Object.keys(fullSuite).filter(
-      (testKey) => only.indexOf(testKey) !== -1 && skip.indexOf(testKey) === -1,
-    );
-
-    const baseMount = createMount();
-    const mount = wrapMount !== undefined ? wrapMount(baseMount) : baseMount;
-
-    after(runAfterHook);
-
-    function getTestOptions() {
-      return {
-        ...getOptions(),
-        mount,
-      };
-    }
-
-    filteredTests.forEach((testKey) => {
-      const test = fullSuite[testKey];
-      test(minimalElement, getTestOptions);
-    });
-  });
-}
diff --git a/test/utils/index.js b/test/utils/index.js
index 492b8be4f51929..7a05cd47eb7874 100644
--- a/test/utils/index.js
+++ b/test/utils/index.js
@@ -1,6 +1,5 @@
 export * from './components';
 export { default as describeConformance } from './describeConformance';
-export { default as describeConformanceV5 } from './describeConformanceV5';
 export { default as describeConformanceUnstyled } from './describeConformanceUnstyled';
 export * from './createClientRender';
 export { default as createMount } from './createMount';