diff --git a/.eslintrc.js b/.eslintrc.js
index e0727c8fa..b73493b3e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -43,7 +43,7 @@ module.exports = {
     'react/destructuring-assignment': 0,
     'react/no-find-dom-node': 1,
     'react/no-array-index-key': 2,
-    'react/button-has-type': 1,
+    'react/button-has-type': 2,
     'jsx-a11y/click-events-have-key-events': 1,
     'jsx-a11y/no-noninteractive-tabindex': 1,
     'jsx-a11y/role-has-required-aria-props': 1,
diff --git a/src/scripts/Button.js b/src/scripts/Button.js
index 1eb48a34b..9ae39b842 100644
--- a/src/scripts/Button.js
+++ b/src/scripts/Button.js
@@ -70,6 +70,7 @@ export default class Button extends Component {
     delete props.items;
 
     return (
+      // eslint-disable-next-line react/button-has-type
       <button
         ref={(node) => {
           this.node = node;
diff --git a/src/scripts/DropdownButton.js b/src/scripts/DropdownButton.js
index 6d604b806..8ee9ff4fd 100644
--- a/src/scripts/DropdownButton.js
+++ b/src/scripts/DropdownButton.js
@@ -142,11 +142,11 @@ export default class DropdownButton extends Component {
       return (
         <div className='slds-button-group'>
           {isFirstInGroup ? null : (
-            <button className='slds-button' style={noneStyle} />
+            <button type='button' className='slds-button' style={noneStyle} />
           )}
           {button}
           {isLastInGroup ? null : (
-            <button className='slds-button' style={noneStyle} />
+            <button type='button' className='slds-button' style={noneStyle} />
           )}
         </div>
       );
diff --git a/test/storyshots/__snapshots__/storyshots.test.js.snap b/test/storyshots/__snapshots__/storyshots.test.js.snap
index fa1303c7c..79cb7bf9c 100644
--- a/test/storyshots/__snapshots__/storyshots.test.js.snap
+++ b/test/storyshots/__snapshots__/storyshots.test.js.snap
@@ -1667,6 +1667,7 @@ exports[`Storyshots ButtonGroup Inverse 1`] = `
                     "display": "none",
                   }
                 }
+                type="button"
               />
               <button
                 aria-haspopup={true}
@@ -1800,6 +1801,7 @@ exports[`Storyshots ButtonGroup More 1`] = `
                   "display": "none",
                 }
               }
+              type="button"
             />
             <button
               aria-haspopup={true}
@@ -36646,6 +36648,7 @@ exports[`Storyshots PageHeader Object Home 1`] = `
                                 "display": "none",
                               }
                             }
+                            type="button"
                           />
                           <button
                             aria-haspopup={true}
@@ -36713,6 +36716,7 @@ exports[`Storyshots PageHeader Object Home 1`] = `
                                 "display": "none",
                               }
                             }
+                            type="button"
                           />
                           <button
                             aria-haspopup={true}
@@ -36928,6 +36932,7 @@ exports[`Storyshots PageHeader Record Home 1`] = `
                                 "display": "none",
                               }
                             }
+                            type="button"
                           />
                           <button
                             aria-haspopup={true}
@@ -37256,6 +37261,7 @@ exports[`Storyshots PageHeader Related List 1`] = `
                                 "display": "none",
                               }
                             }
+                            type="button"
                           />
                           <button
                             aria-haspopup={true}
@@ -37323,6 +37329,7 @@ exports[`Storyshots PageHeader Related List 1`] = `
                                 "display": "none",
                               }
                             }
+                            type="button"
                           />
                           <button
                             aria-haspopup={true}