diff --git a/src/Button.js b/src/Button.js
index 45c21c3fd..8312bb81f 100644
--- a/src/Button.js
+++ b/src/Button.js
@@ -71,7 +71,7 @@ class Button extends React.Component {
       close || 'btn',
       close || btnOutlineColor,
       size ? `btn-${size}` : false,
-      block ? 'btn-block' : false,
+      block ? 'd-block w-100' : false,
       { active, disabled: this.props.disabled }
     ), cssModule);
 
diff --git a/src/__tests__/Button.spec.js b/src/__tests__/Button.spec.js
index 6b95ce5ea..7719db7db 100644
--- a/src/__tests__/Button.spec.js
+++ b/src/__tests__/Button.spec.js
@@ -94,7 +94,7 @@ describe('Button', () => {
   it('should render block level buttons', () => {
     const block = shallow(<Button block>Block Level Button</Button>);
 
-    expect(block.hasClass('btn-block')).toBe(true);
+    expect(block.hasClass('d-block w-100')).toBe(true);
   });
 
   it('should render close icon utility with default props', () => {