diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
index 89e29c21b..d0a54c546 100644
--- a/__tests__/fixtures/tailwind-output.css
+++ b/__tests__/fixtures/tailwind-output.css
@@ -3199,16 +3199,26 @@ button,
   overflow: scroll;
 }
 
-.overflow-x-scroll {
+.overflow-x-auto {
   overflow-x: auto;
   -ms-overflow-style: -ms-autohiding-scrollbar;
 }
 
-.overflow-y-scroll {
+.overflow-y-auto {
   overflow-y: auto;
   -ms-overflow-style: -ms-autohiding-scrollbar;
 }
 
+.overflow-x-scroll {
+  overflow-x: scroll;
+  -ms-overflow-style: -ms-scrollbar;
+}
+
+.overflow-y-scroll {
+  overflow-y: scroll;
+  -ms-overflow-style: -ms-scrollbar;
+}
+
 .scrolling-touch {
   -webkit-overflow-scrolling: touch;
 }
@@ -7090,16 +7100,26 @@ button,
     overflow: scroll;
   }
 
-  .sm\:overflow-x-scroll {
+  .sm\:overflow-x-auto {
     overflow-x: auto;
     -ms-overflow-style: -ms-autohiding-scrollbar;
   }
 
-  .sm\:overflow-y-scroll {
+  .sm\:overflow-y-auto {
     overflow-y: auto;
     -ms-overflow-style: -ms-autohiding-scrollbar;
   }
 
+  .sm\:overflow-x-scroll {
+    overflow-x: scroll;
+    -ms-overflow-style: -ms-scrollbar;
+  }
+
+  .sm\:overflow-y-scroll {
+    overflow-y: scroll;
+    -ms-overflow-style: -ms-scrollbar;
+  }
+
   .sm\:scrolling-touch {
     -webkit-overflow-scrolling: touch;
   }
@@ -10974,16 +10994,26 @@ button,
     overflow: scroll;
   }
 
-  .md\:overflow-x-scroll {
+  .md\:overflow-x-auto {
     overflow-x: auto;
     -ms-overflow-style: -ms-autohiding-scrollbar;
   }
 
-  .md\:overflow-y-scroll {
+  .md\:overflow-y-auto {
     overflow-y: auto;
     -ms-overflow-style: -ms-autohiding-scrollbar;
   }
 
+  .md\:overflow-x-scroll {
+    overflow-x: scroll;
+    -ms-overflow-style: -ms-scrollbar;
+  }
+
+  .md\:overflow-y-scroll {
+    overflow-y: scroll;
+    -ms-overflow-style: -ms-scrollbar;
+  }
+
   .md\:scrolling-touch {
     -webkit-overflow-scrolling: touch;
   }
@@ -14858,16 +14888,26 @@ button,
     overflow: scroll;
   }
 
-  .lg\:overflow-x-scroll {
+  .lg\:overflow-x-auto {
     overflow-x: auto;
     -ms-overflow-style: -ms-autohiding-scrollbar;
   }
 
-  .lg\:overflow-y-scroll {
+  .lg\:overflow-y-auto {
     overflow-y: auto;
     -ms-overflow-style: -ms-autohiding-scrollbar;
   }
 
+  .lg\:overflow-x-scroll {
+    overflow-x: scroll;
+    -ms-overflow-style: -ms-scrollbar;
+  }
+
+  .lg\:overflow-y-scroll {
+    overflow-y: scroll;
+    -ms-overflow-style: -ms-scrollbar;
+  }
+
   .lg\:scrolling-touch {
     -webkit-overflow-scrolling: touch;
   }
@@ -18742,16 +18782,26 @@ button,
     overflow: scroll;
   }
 
-  .xl\:overflow-x-scroll {
+  .xl\:overflow-x-auto {
     overflow-x: auto;
     -ms-overflow-style: -ms-autohiding-scrollbar;
   }
 
-  .xl\:overflow-y-scroll {
+  .xl\:overflow-y-auto {
     overflow-y: auto;
     -ms-overflow-style: -ms-autohiding-scrollbar;
   }
 
+  .xl\:overflow-x-scroll {
+    overflow-x: scroll;
+    -ms-overflow-style: -ms-scrollbar;
+  }
+
+  .xl\:overflow-y-scroll {
+    overflow-y: scroll;
+    -ms-overflow-style: -ms-scrollbar;
+  }
+
   .xl\:scrolling-touch {
     -webkit-overflow-scrolling: touch;
   }
diff --git a/src/generators/overflow.js b/src/generators/overflow.js
index 0346171d0..b4529124f 100644
--- a/src/generators/overflow.js
+++ b/src/generators/overflow.js
@@ -6,14 +6,22 @@ export default function() {
     'overflow-hidden': { overflow: 'hidden' },
     'overflow-visible': { overflow: 'visible' },
     'overflow-scroll': { overflow: 'scroll' },
-    'overflow-x-scroll': {
+    'overflow-x-auto': {
       'overflow-x': 'auto',
       '-ms-overflow-style': '-ms-autohiding-scrollbar',
     },
-    'overflow-y-scroll': {
+    'overflow-y-auto': {
       'overflow-y': 'auto',
       '-ms-overflow-style': '-ms-autohiding-scrollbar',
     },
+    'overflow-x-scroll': {
+       'overflow-x': 'scroll' ,
+      '-ms-overflow-style': '-ms-scrollbar',
+    },
+    'overflow-y-scroll': {
+       'overflow-y': 'scroll' ,
+      '-ms-overflow-style': '-ms-scrollbar',
+    },
     'scrolling-touch': { '-webkit-overflow-scrolling': 'touch' },
     'scrolling-auto': { '-webkit-overflow-scrolling': 'auto' },
   })