diff --git a/ui_framework/components/button/__snapshots__/button.test.js.snap b/ui_framework/components/button/__snapshots__/button.test.js.snap
index abc1fb8bb6198..979451ac42be7 100644
--- a/ui_framework/components/button/__snapshots__/button.test.js.snap
+++ b/ui_framework/components/button/__snapshots__/button.test.js.snap
@@ -7,7 +7,9 @@ exports[`KuiButton Baseline HTML attributes are rendered 1`] = `
   data-test-subj="test subject string"
   disabled=""
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </button>
 `;
 
@@ -15,7 +17,9 @@ exports[`KuiButton Baseline is rendered 1`] = `
 <button
   class="kuiButton"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </button>
 `;
 
@@ -23,7 +27,9 @@ exports[`KuiButton Props children is rendered 1`] = `
 <button
   class="kuiButton"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     <span>
       Hello
     </span>
@@ -35,7 +41,9 @@ exports[`KuiButton Props icon is rendered with children 1`] = `
 <button
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     Icon
     <span>
       Hello
@@ -48,7 +56,9 @@ exports[`KuiButton Props icon is rendered without children 1`] = `
 <button
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     Icon
   </span>
 </button>
@@ -58,7 +68,9 @@ exports[`KuiButton Props iconPosition moves the icon to the right 1`] = `
 <button
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     <span>
       Hello
     </span>
@@ -71,7 +83,9 @@ exports[`KuiButton Props isLoading doesn't render the icon prop 1`] = `
 <button
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     <span
       aria-hidden="true"
       class="kuiButton__icon kuiIcon fa-spinner fa-spin"
@@ -84,7 +98,9 @@ exports[`KuiButton Props isLoading renders a spinner 1`] = `
 <button
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     <span
       aria-hidden="true"
       class="kuiButton__icon kuiIcon fa-spinner fa-spin"
@@ -97,7 +113,9 @@ exports[`KuiButton Props type basic renders the basic class 1`] = `
 <button
   class="kuiButton kuiButton--basic"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </button>
 `;
 
@@ -105,7 +123,9 @@ exports[`KuiButton Props type danger renders the danger class 1`] = `
 <button
   class="kuiButton kuiButton--danger"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </button>
 `;
 
@@ -113,7 +133,9 @@ exports[`KuiButton Props type hollow renders the hollow class 1`] = `
 <button
   class="kuiButton kuiButton--hollow"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </button>
 `;
 
@@ -121,6 +143,8 @@ exports[`KuiButton Props type primary renders the primary class 1`] = `
 <button
   class="kuiButton kuiButton--primary"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </button>
 `;
diff --git a/ui_framework/components/button/__snapshots__/link_button.test.js.snap b/ui_framework/components/button/__snapshots__/link_button.test.js.snap
index 92e4dda672387..8c897a6f25220 100644
--- a/ui_framework/components/button/__snapshots__/link_button.test.js.snap
+++ b/ui_framework/components/button/__snapshots__/link_button.test.js.snap
@@ -8,7 +8,9 @@ exports[`KuiLinkButton Baseline HTML attributes are rendered (and disabled rende
   href="#"
   target="_blank"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </a>
 `;
 
@@ -16,7 +18,9 @@ exports[`KuiLinkButton Baseline is rendered 1`] = `
 <a
   class="kuiButton"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </a>
 `;
 
@@ -24,7 +28,9 @@ exports[`KuiLinkButton Props children is rendered 1`] = `
 <a
   class="kuiButton"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     <span>
       Hello
     </span>
@@ -36,7 +42,9 @@ exports[`KuiLinkButton Props icon is rendered with children 1`] = `
 <a
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     Icon
     <span>
       Hello
@@ -49,7 +57,9 @@ exports[`KuiLinkButton Props icon is rendered without children 1`] = `
 <a
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     Icon
   </span>
 </a>
@@ -59,7 +69,9 @@ exports[`KuiLinkButton Props iconPosition moves the icon to the right 1`] = `
 <a
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     <span>
       Hello
     </span>
@@ -72,7 +84,9 @@ exports[`KuiLinkButton Props isLoading doesn't render the icon prop 1`] = `
 <a
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     <span
       aria-hidden="true"
       class="kuiButton__icon kuiIcon fa-spinner fa-spin"
@@ -85,7 +99,9 @@ exports[`KuiLinkButton Props isLoading renders a spinner 1`] = `
 <a
   class="kuiButton kuiButton--iconText"
 >
-  <span>
+  <span
+    class="kuiButton__inner"
+  >
     <span
       aria-hidden="true"
       class="kuiButton__icon kuiIcon fa-spinner fa-spin"
@@ -98,7 +114,9 @@ exports[`KuiLinkButton Props type basic renders the basic class 1`] = `
 <a
   class="kuiButton kuiButton--basic"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </a>
 `;
 
@@ -106,7 +124,9 @@ exports[`KuiLinkButton Props type danger renders the danger class 1`] = `
 <a
   class="kuiButton kuiButton--danger"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </a>
 `;
 
@@ -114,7 +134,9 @@ exports[`KuiLinkButton Props type hollow renders the hollow class 1`] = `
 <a
   class="kuiButton kuiButton--hollow"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </a>
 `;
 
@@ -122,6 +144,8 @@ exports[`KuiLinkButton Props type primary renders the primary class 1`] = `
 <a
   class="kuiButton kuiButton--primary"
 >
-  <span />
+  <span
+    class="kuiButton__inner"
+  />
 </a>
 `;
diff --git a/ui_framework/components/button/button.js b/ui_framework/components/button/button.js
index 3adeffc4d9940..32868f2c137a1 100644
--- a/ui_framework/components/button/button.js
+++ b/ui_framework/components/button/button.js
@@ -75,7 +75,7 @@ const KuiButton = ({
         type,
         hasIcon: icon || isLoading,
       })}
-      { ...rest }
+      {...rest}
     >
       <ContentWithIcon
         icon={icon}
@@ -128,7 +128,7 @@ const KuiLinkButton = ({
       <ContentWithIcon
         icon={icon}
         iconPosition={iconPosition}
-        isLoading={ isLoading }
+        isLoading={isLoading}
       >
         {children}
       </ContentWithIcon>
@@ -157,7 +157,7 @@ const KuiSubmitButton = ({
       type="submit"
       value={children}
       className={getClassName({ className, type })}
-      { ...rest }
+      {...rest}
     />
   );
 };
diff --git a/ui_framework/components/button/button.test.js b/ui_framework/components/button/button.test.js
index a5458777015e1..85edd8c2ef151 100644
--- a/ui_framework/components/button/button.test.js
+++ b/ui_framework/components/button/button.test.js
@@ -38,7 +38,7 @@ describe('KuiButton', () => {
       BUTTON_TYPES.forEach(type => {
         describe(type, () => {
           test(`renders the ${type} class`, () => {
-            const $button = render(<KuiButton type={ type } />);
+            const $button = render(<KuiButton type={type} />);
             expect($button).toMatchSnapshot();
           });
         });
diff --git a/ui_framework/components/button/link_button.test.js b/ui_framework/components/button/link_button.test.js
index fb9dcdb260e0b..7cccc1ab099fb 100644
--- a/ui_framework/components/button/link_button.test.js
+++ b/ui_framework/components/button/link_button.test.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { render } from 'enzyme';
 
 import {
+  BUTTON_TYPES,
   KuiLinkButton,
 } from './button';
 
@@ -35,47 +36,12 @@ describe('KuiLinkButton', () => {
 
   describe('Props', () => {
     describe('type', () => {
-      describe('basic', () => {
-        test('renders the basic class', () => {
-          const $button = render(
-            <KuiLinkButton type="basic" />
-          );
-
-          expect($button)
-            .toMatchSnapshot();
-        });
-      });
-
-      describe('hollow', () => {
-        test('renders the hollow class', () => {
-          const $button = render(
-            <KuiLinkButton type="hollow" />
-          );
-
-          expect($button)
-            .toMatchSnapshot();
-        });
-      });
-
-      describe('danger', () => {
-        test('renders the danger class', () => {
-          const $button = render(
-            <KuiLinkButton type="danger" />
-          );
-
-          expect($button)
-            .toMatchSnapshot();
-        });
-      });
-
-      describe('primary', () => {
-        test('renders the primary class', () => {
-          const $button = render(
-            <KuiLinkButton type="primary" />
-          );
-
-          expect($button)
-            .toMatchSnapshot();
+      BUTTON_TYPES.forEach(type => {
+        describe(type, () => {
+          test(`renders the ${type} class`, () => {
+            const $button = render(<KuiLinkButton type={type} />);
+            expect($button).toMatchSnapshot();
+          });
         });
       });
     });
diff --git a/ui_framework/components/button/submit_button.test.js b/ui_framework/components/button/submit_button.test.js
index 81b74cc4ced30..62462d5154ff7 100644
--- a/ui_framework/components/button/submit_button.test.js
+++ b/ui_framework/components/button/submit_button.test.js
@@ -3,6 +3,7 @@ import { render, shallow } from 'enzyme';
 import sinon from 'sinon';
 
 import {
+  BUTTON_TYPES,
   KuiSubmitButton,
 } from './button';
 
@@ -34,47 +35,12 @@ describe('KuiSubmitButton', () => {
 
   describe('Props', () => {
     describe('type', () => {
-      describe('basic', () => {
-        test('renders the basic class', () => {
-          const $button = render(
-            <KuiSubmitButton type="basic" />
-          );
-
-          expect($button)
-            .toMatchSnapshot();
-        });
-      });
-
-      describe('hollow', () => {
-        test('renders the hollow class', () => {
-          const $button = render(
-            <KuiSubmitButton type="hollow" />
-          );
-
-          expect($button)
-            .toMatchSnapshot();
-        });
-      });
-
-      describe('danger', () => {
-        test('renders the danger class', () => {
-          const $button = render(
-            <KuiSubmitButton type="danger" />
-          );
-
-          expect($button)
-            .toMatchSnapshot();
-        });
-      });
-
-      describe('primary', () => {
-        test('renders the primary class', () => {
-          const $button = render(
-            <KuiSubmitButton type="primary" />
-          );
-
-          expect($button)
-            .toMatchSnapshot();
+      BUTTON_TYPES.forEach(type => {
+        describe(type, () => {
+          test(`renders the ${type} class`, () => {
+            const $button = render(<KuiSubmitButton type={type} />);
+            expect($button).toMatchSnapshot();
+          });
         });
       });
     });