diff --git a/ui_framework/components/button/__snapshots__/button.test.js.snap b/ui_framework/components/button/__snapshots__/button.test.js.snap
index 86a853ca884fa..ab8b452e7019b 100644
--- a/ui_framework/components/button/__snapshots__/button.test.js.snap
+++ b/ui_framework/components/button/__snapshots__/button.test.js.snap
@@ -1,43 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`KuiButton Baseline is rendered 1`] = `
-<button
-  class="kuiButton"
->
-  <span />
-</button>
-`;
-
-exports[`KuiButton HTML attributes aria-label is rendered 1`] = `
+exports[`KuiButton Baseline HTML attributes are rendered 1`] = `
 <button
   aria-label="aria label"
-  class="kuiButton"
->
-  <span />
-</button>
-`;
-
-exports[`KuiButton HTML attributes className renders the classes 1`] = `
-<button
-  class="kuiButton testClass1 testClass2"
->
-  <span />
-</button>
-`;
-
-exports[`KuiButton HTML attributes data-test-subj is rendered 1`] = `
-<button
-  class="kuiButton"
+  class="kuiButton testClass1 testClass2 kuiButton-isDisabled"
   data-test-subj="test subject string"
+  disabled=""
 >
   <span />
 </button>
 `;
 
-exports[`KuiButton HTML attributes disabled sets the disabled attribute and class 1`] = `
+exports[`KuiButton Baseline is rendered 1`] = `
 <button
-  class="kuiButton kuiButton-isDisabled"
-  disabled=""
+  class="kuiButton"
 >
   <span />
 </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 a305c2cc88a6c..6935d87e61b79 100644
--- a/ui_framework/components/button/__snapshots__/link_button.test.js.snap
+++ b/ui_framework/components/button/__snapshots__/link_button.test.js.snap
@@ -1,60 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`KuiLinkButton Baseline is rendered 1`] = `
-<a
-  class="kuiButton"
->
-  <span />
-</a>
-`;
-
-exports[`KuiLinkButton HTML attributes aria-label is rendered 1`] = `
+exports[`KuiLinkButton Baseline HTML attributes are rendered (and disabled renders a class) 1`] = `
 <a
   aria-label="aria label"
-  class="kuiButton"
->
-  <span />
-</a>
-`;
-
-exports[`KuiLinkButton HTML attributes className renders the classes 1`] = `
-<a
-  class="kuiButton testClass1 testClass2"
->
-  <span />
-</a>
-`;
-
-exports[`KuiLinkButton HTML attributes data-test-subj is rendered 1`] = `
-<a
-  class="kuiButton"
+  class="kuiButton testClass1 testClass2 kuiButton-isDisabled"
   data-test-subj="test subject string"
->
-  <span />
-</a>
-`;
-
-exports[`KuiLinkButton HTML attributes disabled sets the disabled class 1`] = `
-<a
-  class="kuiButton kuiButton-isDisabled"
->
-  <span />
-</a>
-`;
-
-exports[`KuiLinkButton HTML attributes href is rendered 1`] = `
-<a
-  class="kuiButton"
   href="#"
+  target="_blank"
 >
   <span />
 </a>
 `;
 
-exports[`KuiLinkButton HTML attributes target is rendered 1`] = `
+exports[`KuiLinkButton Baseline is rendered 1`] = `
 <a
   class="kuiButton"
-  target="_blank"
 >
   <span />
 </a>
diff --git a/ui_framework/components/button/__snapshots__/submit_button.test.js.snap b/ui_framework/components/button/__snapshots__/submit_button.test.js.snap
index be16b7cbed1e2..9290fe5be2141 100644
--- a/ui_framework/components/button/__snapshots__/submit_button.test.js.snap
+++ b/ui_framework/components/button/__snapshots__/submit_button.test.js.snap
@@ -1,5 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`KuiSubmitButton Baseline HTML attributes are rendered 1`] = `
+<input
+  aria-label="aria label"
+  class="kuiButton testClass1 testClass2 kuiButton-isDisabled"
+  data-test-subj="test subject string"
+  disabled=""
+  type="submit"
+/>
+`;
+
 exports[`KuiSubmitButton Baseline is rendered 1`] = `
 <input
   class="kuiButton"
diff --git a/ui_framework/components/button/button.test.js b/ui_framework/components/button/button.test.js
index 9c997451c37ca..9ced7a3df6a6a 100644
--- a/ui_framework/components/button/button.test.js
+++ b/ui_framework/components/button/button.test.js
@@ -19,51 +19,19 @@ describe('KuiButton', () => {
       expect($button)
         .toMatchSnapshot();
     });
-  });
-
-  describe('HTML attributes', () => {
-    describe('aria-label', () => {
-      test('is rendered', () => {
-        const $button = render(
-          <KuiButton aria-label="aria label" />
-        );
-
-        expect($button)
-          .toMatchSnapshot();
-      });
-    });
-
-    describe('disabled', () => {
-      test('sets the disabled attribute and class', () => {
-        const $button = render(
-          <KuiButton disabled />
-        );
-
-        expect($button)
-          .toMatchSnapshot();
-      });
-    });
 
-    describe('data-test-subj', () => {
-      test('is rendered', () => {
-        const $button = render(
-          <KuiButton data-test-subj="test subject string" />
-        );
-
-        expect($button)
-          .toMatchSnapshot();
-      });
-    });
-
-    describe('className', () => {
-      test('renders the classes', () => {
-        const $button = render(
-          <KuiButton className="testClass1 testClass2" />
-        );
+    test('HTML attributes are rendered', () => {
+      const $button = render(
+        <KuiButton
+          aria-label="aria label"
+          className="testClass1 testClass2"
+          data-test-subj="test subject string"
+          disabled
+        />
+      );
 
-        expect($button)
-          .toMatchSnapshot();
-      });
+      expect($button)
+        .toMatchSnapshot();
     });
   });
 
diff --git a/ui_framework/components/button/link_button.test.js b/ui_framework/components/button/link_button.test.js
index acfac6585cfeb..4c2c1078f951d 100644
--- a/ui_framework/components/button/link_button.test.js
+++ b/ui_framework/components/button/link_button.test.js
@@ -17,73 +17,21 @@ describe('KuiLinkButton', () => {
       expect($button)
         .toMatchSnapshot();
     });
-  });
-
-  describe('HTML attributes', () => {
-    describe('href', () => {
-      test('is rendered', () => {
-        const $button = render(
-          <KuiLinkButton href="#" />
-        );
-
-        expect($button)
-          .toMatchSnapshot();
-      });
-    });
-
-    describe('target', () => {
-      test('is rendered', () => {
-        const $button = render(
-          <KuiLinkButton target="_blank" />
-        );
-
-        expect($button)
-          .toMatchSnapshot();
-      });
-    });
-
-    describe('aria-label', () => {
-      test('is rendered', () => {
-        const $button = render(
-          <KuiLinkButton aria-label="aria label" />
-        );
-
-        expect($button)
-          .toMatchSnapshot();
-      });
-    });
-
-    describe('disabled', () => {
-      test('sets the disabled class', () => {
-        const $button = render(
-          <KuiLinkButton disabled />
-        );
-
-        expect($button)
-          .toMatchSnapshot();
-      });
-    });
 
-    describe('data-test-subj', () => {
-      test('is rendered', () => {
-        const $button = render(
-          <KuiLinkButton data-test-subj="test subject string" />
-        );
-
-        expect($button)
-          .toMatchSnapshot();
-      });
-    });
-
-    describe('className', () => {
-      test('renders the classes', () => {
-        const $button = render(
-          <KuiLinkButton className="testClass1 testClass2" />
-        );
+    test('HTML attributes are rendered (and disabled renders a class)', () => {
+      const $button = render(
+        <KuiLinkButton
+          aria-label="aria label"
+          className="testClass1 testClass2"
+          data-test-subj="test subject string"
+          disabled
+          href="#"
+          target="_blank"
+        />
+      );
 
-        expect($button)
-          .toMatchSnapshot();
-      });
+      expect($button)
+        .toMatchSnapshot();
     });
   });
 
diff --git a/ui_framework/components/button/submit_button.test.js b/ui_framework/components/button/submit_button.test.js
index 2c2c1b95c8f2c..6857b44a22e06 100644
--- a/ui_framework/components/button/submit_button.test.js
+++ b/ui_framework/components/button/submit_button.test.js
@@ -18,6 +18,20 @@ describe('KuiSubmitButton', () => {
       expect($button)
         .toMatchSnapshot();
     });
+
+    test('HTML attributes are rendered', () => {
+      const $button = render(
+        <KuiSubmitButton
+          aria-label="aria label"
+          className="testClass1 testClass2"
+          data-test-subj="test subject string"
+          disabled
+        />
+      );
+
+      expect($button)
+        .toMatchSnapshot();
+    });
   });
 
   describe('HTML attributes', () => {