diff --git a/packages/material-ui-lab/src/Skeleton/Skeleton.js b/packages/material-ui-lab/src/Skeleton/Skeleton.js
index c4696edc76d578..ca76a25e66afbe 100644
--- a/packages/material-ui-lab/src/Skeleton/Skeleton.js
+++ b/packages/material-ui-lab/src/Skeleton/Skeleton.js
@@ -74,7 +74,7 @@ const Skeleton = React.forwardRef(function Skeleton(props, ref) {
     animation = 'pulse',
     classes,
     className,
-    component: Component = 'div',
+    component: Component = ['rect', 'circle'].indexOf(props.variant) > -1 ? 'div' : 'span',
     height,
     variant = 'text',
     width,
diff --git a/packages/material-ui-lab/src/Skeleton/Skeleton.test.js b/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
index 502c377c676722..8d9323a15595a7 100644
--- a/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
+++ b/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
@@ -21,9 +21,9 @@ describe('<Skeleton />', () => {
 
   describeConformance(<Skeleton />, () => ({
     classes,
-    inheritComponent: 'div',
+    inheritComponent: 'span',
     mount,
-    refInstanceof: window.HTMLDivElement,
+    refInstanceof: window.HTMLSpanElement,
   }));
 
   it('should render', () => {