diff --git a/src/components/button/__snapshots__/button.test.js.snap b/src/components/button/__snapshots__/button.test.js.snap
index 32cb0ed7820..7a438cdc76b 100644
--- a/src/components/button/__snapshots__/button.test.js.snap
+++ b/src/components/button/__snapshots__/button.test.js.snap
@@ -6,6 +6,226 @@ exports[`EuiButton is rendered 1`] = `
   class="euiButton euiButton--primary testClass1 testClass2"
   data-test-subj="test subject string"
   type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span>
+      Content
+    </span>
+  </span>
+</button>
+`;
+
+exports[`EuiButton props color danger is rendered 1`] = `
+<button
+  class="euiButton euiButton--danger"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props color ghost is rendered 1`] = `
+<button
+  class="euiButton euiButton--ghost"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props color primary is rendered 1`] = `
+<button
+  class="euiButton euiButton--primary"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props color secondary is rendered 1`] = `
+<button
+  class="euiButton euiButton--secondary"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props color warning is rendered 1`] = `
+<button
+  class="euiButton euiButton--warning"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props fill is rendered 1`] = `
+<button
+  class="euiButton euiButton--primary euiButton--fill"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props iconSide left is rendered 1`] = `
+<button
+  class="euiButton euiButton--primary"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <svg
+      aria-hidden="true"
+      class="euiIcon euiButton__icon euiIcon--medium"
+      height="18"
+      viewBox="0 0 18 18"
+      width="18"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        fill-rule="evenodd"
+      >
+        <path
+          d="M13.689 11.132c1.155 1.222 1.953 2.879 2.183 4.748a1.007 1.007 0 0 1-1 1.12H3.007a1.005 1.005 0 0 1-1-1.12c.23-1.87 1.028-3.526 2.183-4.748.247.228.505.442.782.633-1.038 1.069-1.765 2.55-1.972 4.237L14.872 16c-.204-1.686-.93-3.166-1.966-4.235a7.01 7.01 0 0 0 .783-.633zM8.939 1c1.9 0 3 2 4.38 2.633a2.483 2.483 0 0 1-1.88.867c-.298 0-.579-.06-.844-.157A3.726 3.726 0 0 1 7.69 5.75c-1.395 0-3.75.25-3.245-1.903C5.94 3 6.952 1 8.94 1z"
+        />
+        <path
+          d="M8.94 2c2.205 0 4 1.794 4 4s-1.795 4-4 4c-2.207 0-4-1.794-4-4s1.793-4 4-4m0 9A5 5 0 1 0 8.937.999 5 5 0 0 0 8.94 11"
+        />
+      </g>
+    </svg>
+    <span>
+      Content
+    </span>
+  </span>
+</button>
+`;
+
+exports[`EuiButton props iconSide right is rendered 1`] = `
+<button
+  class="euiButton euiButton--primary euiButton--iconRight"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <svg
+      aria-hidden="true"
+      class="euiIcon euiButton__icon euiIcon--medium"
+      height="18"
+      viewBox="0 0 18 18"
+      width="18"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        fill-rule="evenodd"
+      >
+        <path
+          d="M13.689 11.132c1.155 1.222 1.953 2.879 2.183 4.748a1.007 1.007 0 0 1-1 1.12H3.007a1.005 1.005 0 0 1-1-1.12c.23-1.87 1.028-3.526 2.183-4.748.247.228.505.442.782.633-1.038 1.069-1.765 2.55-1.972 4.237L14.872 16c-.204-1.686-.93-3.166-1.966-4.235a7.01 7.01 0 0 0 .783-.633zM8.939 1c1.9 0 3 2 4.38 2.633a2.483 2.483 0 0 1-1.88.867c-.298 0-.579-.06-.844-.157A3.726 3.726 0 0 1 7.69 5.75c-1.395 0-3.75.25-3.245-1.903C5.94 3 6.952 1 8.94 1z"
+        />
+        <path
+          d="M8.94 2c2.205 0 4 1.794 4 4s-1.795 4-4 4c-2.207 0-4-1.794-4-4s1.793-4 4-4m0 9A5 5 0 1 0 8.937.999 5 5 0 0 0 8.94 11"
+        />
+      </g>
+    </svg>
+    <span>
+      Content
+    </span>
+  </span>
+</button>
+`;
+
+exports[`EuiButton props iconType is rendered 1`] = `
+<button
+  class="euiButton euiButton--primary"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <svg
+      aria-hidden="true"
+      class="euiIcon euiButton__icon euiIcon--medium"
+      height="18"
+      viewBox="0 0 18 18"
+      width="18"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        fill-rule="evenodd"
+      >
+        <path
+          d="M13.689 11.132c1.155 1.222 1.953 2.879 2.183 4.748a1.007 1.007 0 0 1-1 1.12H3.007a1.005 1.005 0 0 1-1-1.12c.23-1.87 1.028-3.526 2.183-4.748.247.228.505.442.782.633-1.038 1.069-1.765 2.55-1.972 4.237L14.872 16c-.204-1.686-.93-3.166-1.966-4.235a7.01 7.01 0 0 0 .783-.633zM8.939 1c1.9 0 3 2 4.38 2.633a2.483 2.483 0 0 1-1.88.867c-.298 0-.579-.06-.844-.157A3.726 3.726 0 0 1 7.69 5.75c-1.395 0-3.75.25-3.245-1.903C5.94 3 6.952 1 8.94 1z"
+        />
+        <path
+          d="M8.94 2c2.205 0 4 1.794 4 4s-1.795 4-4 4c-2.207 0-4-1.794-4-4s1.793-4 4-4m0 9A5 5 0 1 0 8.937.999 5 5 0 0 0 8.94 11"
+        />
+      </g>
+    </svg>
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props isDisabled is rendered 1`] = `
+<button
+  class="euiButton euiButton--primary"
+  disabled=""
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props size l is rendered 1`] = `
+<button
+  class="euiButton euiButton--primary euiButton--large"
+  type="button"
+>
+  <span
+    class="euiButton__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButton props size s is rendered 1`] = `
+<button
+  class="euiButton euiButton--primary euiButton--small"
+  type="button"
 >
   <span
     class="euiButton__content"
diff --git a/src/components/button/button.test.js b/src/components/button/button.test.js
index 1025e8136cc..21dc4d70b3d 100644
--- a/src/components/button/button.test.js
+++ b/src/components/button/button.test.js
@@ -2,15 +2,98 @@ import React from 'react';
 import { render } from 'enzyme';
 import { requiredProps } from '../../test/required_props';
 
-import { EuiButton } from './button';
+import {
+  EuiButton,
+  COLORS,
+  SIZES,
+  ICON_SIDES,
+} from './button';
 
 describe('EuiButton', () => {
   test('is rendered', () => {
     const component = render(
-      <EuiButton {...requiredProps} />
+      <EuiButton {...requiredProps}>
+        Content
+      </EuiButton>
     );
 
     expect(component)
       .toMatchSnapshot();
   });
+
+  describe('props', () => {
+    describe('fill', () => {
+      it('is rendered', () => {
+        const component = render(
+          <EuiButton fill />
+        );
+
+        expect(component)
+          .toMatchSnapshot();
+      });
+    });
+
+    describe('isDisabled', () => {
+      it('is rendered', () => {
+        const component = render(
+          <EuiButton isDisabled />
+        );
+
+        expect(component)
+          .toMatchSnapshot();
+      });
+    });
+
+    describe('iconType', () => {
+      it('is rendered', () => {
+        const component = render(
+          <EuiButton iconType="user" />
+        );
+
+        expect(component)
+          .toMatchSnapshot();
+      });
+    });
+
+    describe('color', () => {
+      COLORS.forEach(color => {
+        test(`${color} is rendered`, () => {
+          const component = render(
+            <EuiButton color={color} />
+          );
+
+          expect(component)
+            .toMatchSnapshot();
+        });
+      });
+    });
+
+    describe('size', () => {
+      SIZES.forEach(size => {
+        test(`${size} is rendered`, () => {
+          const component = render(
+            <EuiButton size={size} />
+          );
+
+          expect(component)
+            .toMatchSnapshot();
+        });
+      });
+    });
+
+    describe('iconSide', () => {
+      ICON_SIDES.forEach(iconSide => {
+        test(`${iconSide} is rendered`, () => {
+          const component = render(
+            <EuiButton iconType="user" iconSide={iconSide}>
+              Content
+            </EuiButton>
+          );
+
+          expect(component)
+            .toMatchSnapshot();
+        });
+      });
+    });
+  });
 });
diff --git a/src/components/button/button_empty/__snapshots__/button_empty.test.js.snap b/src/components/button/button_empty/__snapshots__/button_empty.test.js.snap
index e3f5b15f11f..0efdcabf2c8 100644
--- a/src/components/button/button_empty/__snapshots__/button_empty.test.js.snap
+++ b/src/components/button/button_empty/__snapshots__/button_empty.test.js.snap
@@ -6,6 +6,252 @@ exports[`EuiButtonEmpty is rendered 1`] = `
   class="euiButtonEmpty euiButtonEmpty--primary testClass1 testClass2"
   data-test-subj="test subject string"
   type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span>
+      Content
+    </span>
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props color danger is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--danger"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props color disabled is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--disabled"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props color ghost is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--ghost"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props color primary is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props color text is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--text"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props flush left is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--flushLeft"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props flush right is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--flushRight"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props iconSide left is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <svg
+      aria-hidden="true"
+      class="euiIcon euiButtonEmpty__icon euiIcon--medium"
+      height="18"
+      viewBox="0 0 18 18"
+      width="18"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        fill-rule="evenodd"
+      >
+        <path
+          d="M13.689 11.132c1.155 1.222 1.953 2.879 2.183 4.748a1.007 1.007 0 0 1-1 1.12H3.007a1.005 1.005 0 0 1-1-1.12c.23-1.87 1.028-3.526 2.183-4.748.247.228.505.442.782.633-1.038 1.069-1.765 2.55-1.972 4.237L14.872 16c-.204-1.686-.93-3.166-1.966-4.235a7.01 7.01 0 0 0 .783-.633zM8.939 1c1.9 0 3 2 4.38 2.633a2.483 2.483 0 0 1-1.88.867c-.298 0-.579-.06-.844-.157A3.726 3.726 0 0 1 7.69 5.75c-1.395 0-3.75.25-3.245-1.903C5.94 3 6.952 1 8.94 1z"
+        />
+        <path
+          d="M8.94 2c2.205 0 4 1.794 4 4s-1.795 4-4 4c-2.207 0-4-1.794-4-4s1.793-4 4-4m0 9A5 5 0 1 0 8.937.999 5 5 0 0 0 8.94 11"
+        />
+      </g>
+    </svg>
+    <span>
+      Content
+    </span>
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props iconSide right is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--iconRight"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <svg
+      aria-hidden="true"
+      class="euiIcon euiButtonEmpty__icon euiIcon--medium"
+      height="18"
+      viewBox="0 0 18 18"
+      width="18"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        fill-rule="evenodd"
+      >
+        <path
+          d="M13.689 11.132c1.155 1.222 1.953 2.879 2.183 4.748a1.007 1.007 0 0 1-1 1.12H3.007a1.005 1.005 0 0 1-1-1.12c.23-1.87 1.028-3.526 2.183-4.748.247.228.505.442.782.633-1.038 1.069-1.765 2.55-1.972 4.237L14.872 16c-.204-1.686-.93-3.166-1.966-4.235a7.01 7.01 0 0 0 .783-.633zM8.939 1c1.9 0 3 2 4.38 2.633a2.483 2.483 0 0 1-1.88.867c-.298 0-.579-.06-.844-.157A3.726 3.726 0 0 1 7.69 5.75c-1.395 0-3.75.25-3.245-1.903C5.94 3 6.952 1 8.94 1z"
+        />
+        <path
+          d="M8.94 2c2.205 0 4 1.794 4 4s-1.795 4-4 4c-2.207 0-4-1.794-4-4s1.793-4 4-4m0 9A5 5 0 1 0 8.937.999 5 5 0 0 0 8.94 11"
+        />
+      </g>
+    </svg>
+    <span>
+      Content
+    </span>
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props iconType is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <svg
+      aria-hidden="true"
+      class="euiIcon euiButtonEmpty__icon euiIcon--medium"
+      height="18"
+      viewBox="0 0 18 18"
+      width="18"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        fill-rule="evenodd"
+      >
+        <path
+          d="M13.689 11.132c1.155 1.222 1.953 2.879 2.183 4.748a1.007 1.007 0 0 1-1 1.12H3.007a1.005 1.005 0 0 1-1-1.12c.23-1.87 1.028-3.526 2.183-4.748.247.228.505.442.782.633-1.038 1.069-1.765 2.55-1.972 4.237L14.872 16c-.204-1.686-.93-3.166-1.966-4.235a7.01 7.01 0 0 0 .783-.633zM8.939 1c1.9 0 3 2 4.38 2.633a2.483 2.483 0 0 1-1.88.867c-.298 0-.579-.06-.844-.157A3.726 3.726 0 0 1 7.69 5.75c-1.395 0-3.75.25-3.245-1.903C5.94 3 6.952 1 8.94 1z"
+        />
+        <path
+          d="M8.94 2c2.205 0 4 1.794 4 4s-1.795 4-4 4c-2.207 0-4-1.794-4-4s1.793-4 4-4m0 9A5 5 0 1 0 8.937.999 5 5 0 0 0 8.94 11"
+        />
+      </g>
+    </svg>
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props isDisabled is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary"
+  disabled=""
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props size l is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--large"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props size s is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span />
+  </span>
+</button>
+`;
+
+exports[`EuiButtonEmpty props size xs is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
+  type="button"
 >
   <span
     class="euiButtonEmpty__content"
diff --git a/src/components/button/button_empty/button_empty.test.js b/src/components/button/button_empty/button_empty.test.js
index 7ed96f6e90d..71de955c421 100644
--- a/src/components/button/button_empty/button_empty.test.js
+++ b/src/components/button/button_empty/button_empty.test.js
@@ -2,15 +2,101 @@ import React from 'react';
 import { render } from 'enzyme';
 import { requiredProps } from '../../../test/required_props';
 
-import { EuiButtonEmpty } from './button_empty';
+import {
+  EuiButtonEmpty,
+  COLORS,
+  SIZES,
+  ICON_SIDES,
+  FLUSH_TYPES,
+} from './button_empty';
 
 describe('EuiButtonEmpty', () => {
   test('is rendered', () => {
     const component = render(
-      <EuiButtonEmpty {...requiredProps} />
+      <EuiButtonEmpty {...requiredProps}>
+        Content
+      </EuiButtonEmpty>
     );
 
     expect(component)
       .toMatchSnapshot();
   });
+
+  describe('props', () => {
+    describe('isDisabled', () => {
+      it('is rendered', () => {
+        const component = render(
+          <EuiButtonEmpty isDisabled />
+        );
+
+        expect(component)
+          .toMatchSnapshot();
+      });
+    });
+
+    describe('iconType', () => {
+      it('is rendered', () => {
+        const component = render(
+          <EuiButtonEmpty iconType="user" />
+        );
+
+        expect(component)
+          .toMatchSnapshot();
+      });
+    });
+
+    describe('color', () => {
+      COLORS.forEach(color => {
+        test(`${color} is rendered`, () => {
+          const component = render(
+            <EuiButtonEmpty color={color} />
+          );
+
+          expect(component)
+            .toMatchSnapshot();
+        });
+      });
+    });
+
+    describe('size', () => {
+      SIZES.forEach(size => {
+        test(`${size} is rendered`, () => {
+          const component = render(
+            <EuiButtonEmpty size={size} />
+          );
+
+          expect(component)
+            .toMatchSnapshot();
+        });
+      });
+    });
+
+    describe('iconSide', () => {
+      ICON_SIDES.forEach(iconSide => {
+        test(`${iconSide} is rendered`, () => {
+          const component = render(
+            <EuiButtonEmpty iconType="user" iconSide={iconSide}>
+              Content
+            </EuiButtonEmpty>
+          );
+
+          expect(component)
+            .toMatchSnapshot();
+        });
+      });
+    });
+
+    describe('flush', () => {
+      FLUSH_TYPES.forEach(flushType => {
+        test(`${flushType} is rendered`, () => {
+          const component = render(
+            <EuiButtonEmpty flush={flushType} />
+          );
+
+          expect(component)
+            .toMatchSnapshot();
+        });
+      });
+    });
+  });
 });
diff --git a/src/components/button/button_icon/__snapshots__/button_icon.test.js.snap b/src/components/button/button_icon/__snapshots__/button_icon.test.js.snap
index 5ce51c02198..9e36e223cf8 100644
--- a/src/components/button/button_icon/__snapshots__/button_icon.test.js.snap
+++ b/src/components/button/button_icon/__snapshots__/button_icon.test.js.snap
@@ -8,3 +8,80 @@ exports[`EuiButtonIcon is rendered 1`] = `
   type="button"
 />
 `;
+
+exports[`EuiButtonIcon props color danger is rendered 1`] = `
+<button
+  aria-label="button"
+  class="euiButtonIcon euiButtonIcon--danger"
+  type="button"
+/>
+`;
+
+exports[`EuiButtonIcon props color disabled is rendered 1`] = `
+<button
+  aria-label="button"
+  class="euiButtonIcon euiButtonIcon--disabled"
+  type="button"
+/>
+`;
+
+exports[`EuiButtonIcon props color ghost is rendered 1`] = `
+<button
+  aria-label="button"
+  class="euiButtonIcon euiButtonIcon--ghost"
+  type="button"
+/>
+`;
+
+exports[`EuiButtonIcon props color primary is rendered 1`] = `
+<button
+  aria-label="button"
+  class="euiButtonIcon euiButtonIcon--primary"
+  type="button"
+/>
+`;
+
+exports[`EuiButtonIcon props color text is rendered 1`] = `
+<button
+  aria-label="button"
+  class="euiButtonIcon euiButtonIcon--text"
+  type="button"
+/>
+`;
+
+exports[`EuiButtonIcon props iconType is rendered 1`] = `
+<button
+  aria-label="button"
+  class="euiButtonIcon euiButtonIcon--primary"
+  type="button"
+>
+  <svg
+    aria-hidden="true"
+    class="euiIcon euiButtonIcon__icon euiIcon--medium"
+    height="18"
+    viewBox="0 0 18 18"
+    width="18"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <g
+      fill-rule="evenodd"
+    >
+      <path
+        d="M13.689 11.132c1.155 1.222 1.953 2.879 2.183 4.748a1.007 1.007 0 0 1-1 1.12H3.007a1.005 1.005 0 0 1-1-1.12c.23-1.87 1.028-3.526 2.183-4.748.247.228.505.442.782.633-1.038 1.069-1.765 2.55-1.972 4.237L14.872 16c-.204-1.686-.93-3.166-1.966-4.235a7.01 7.01 0 0 0 .783-.633zM8.939 1c1.9 0 3 2 4.38 2.633a2.483 2.483 0 0 1-1.88.867c-.298 0-.579-.06-.844-.157A3.726 3.726 0 0 1 7.69 5.75c-1.395 0-3.75.25-3.245-1.903C5.94 3 6.952 1 8.94 1z"
+      />
+      <path
+        d="M8.94 2c2.205 0 4 1.794 4 4s-1.795 4-4 4c-2.207 0-4-1.794-4-4s1.793-4 4-4m0 9A5 5 0 1 0 8.937.999 5 5 0 0 0 8.94 11"
+      />
+    </g>
+  </svg>
+</button>
+`;
+
+exports[`EuiButtonIcon props isDisabled is rendered 1`] = `
+<button
+  aria-label="button"
+  class="euiButtonIcon euiButtonIcon--primary"
+  disabled=""
+  type="button"
+/>
+`;
diff --git a/src/components/button/button_icon/button_icon.test.js b/src/components/button/button_icon/button_icon.test.js
index ed4c815cb8c..d8b0214b47f 100644
--- a/src/components/button/button_icon/button_icon.test.js
+++ b/src/components/button/button_icon/button_icon.test.js
@@ -2,15 +2,52 @@ import React from 'react';
 import { render } from 'enzyme';
 import { requiredProps } from '../../../test/required_props';
 
-import { EuiButtonIcon } from './button_icon';
+import { EuiButtonIcon, COLORS } from './button_icon';
 
 describe('EuiButtonIcon', () => {
   test('is rendered', () => {
     const component = render(
-      <EuiButtonIcon aria-label="ariaLabel" {...requiredProps} />
+      <EuiButtonIcon {...requiredProps} />
     );
 
     expect(component)
       .toMatchSnapshot();
   });
+
+  describe('props', () => {
+    describe('isDisabled', () => {
+      it('is rendered', () => {
+        const component = render(
+          <EuiButtonIcon aria-label="button" isDisabled />
+        );
+
+        expect(component)
+          .toMatchSnapshot();
+      });
+    });
+
+    describe('iconType', () => {
+      it('is rendered', () => {
+        const component = render(
+          <EuiButtonIcon aria-label="button" iconType="user" />
+        );
+
+        expect(component)
+          .toMatchSnapshot();
+      });
+    });
+
+    describe('color', () => {
+      COLORS.forEach(color => {
+        test(`${color} is rendered`, () => {
+          const component = render(
+            <EuiButtonIcon aria-label="button" color={color} />
+          );
+
+          expect(component)
+            .toMatchSnapshot();
+        });
+      });
+    });
+  });
 });