diff --git a/src/lib/button/button.spec.ts b/src/lib/button/button.spec.ts
index f23f7f669b60..6f4ed673d244 100644
--- a/src/lib/button/button.spec.ts
+++ b/src/lib/button/button.spec.ts
@@ -43,8 +43,9 @@ describe('MatButton', () => {
 
   it('should expose the ripple instance', () => {
     const fixture = TestBed.createComponent(TestApp);
-    const button = fixture.debugElement.query(By.css('button')).componentInstance as MatButton;
+    fixture.detectChanges();
 
+    const button = fixture.debugElement.query(By.directive(MatButton)).componentInstance;
     expect(button.ripple).toBeTruthy();
   });
 
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index 8b4fcb260b45..96ad9f52ceca 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -70,7 +70,7 @@ export const _MatButtonMixinBase:
              button[mat-flat-button]`,
   exportAs: 'matButton',
   host: {
-    '[disabled]': 'disabled || null',
+    '[attr.disabled]': 'disabled || null',
     '[class._mat-animation-noopable]': '_animationMode === "NoopAnimations"',
   },
   templateUrl: 'button.html',