diff --git a/.travis.yml b/.travis.yml
index 7544dea8bd2b..3ec87189c175 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
     # we alias FIREBASE_ACCESS_TOKEN to $SAUCE_ACCESS_KEY in env.sh and set the SAUCE_ACCESS_KEY there
     - secure: "PKts/IbxuJRWWOEeiGbl8Z9zds0M+hIdCH/g/E4WbQ9yzSvSbdwzfmRfFccQFjxjsrY7+SJMVjsURZy+xUyBpzqgWYHUItnSVqjZb8DlyAU2IXyg8TM9BVLkGGe6k5k4PIFVmfMMMzQwWMM0X0W9w3oYmfHL5egxwSHvf9HIqLolLNXg8sqamIdS5d5KoCXf1c+oRjN/IMBktzNBR6N4OFOZQXVoepXNiIvTWAcTtOPBvFWdKP2n7RVioHKdm4a85aCUpDJp+LYGaLqiQZoRzmzfVTnAhTAPdd4ao5w/+jojrfZIHV55bqYF9rLnQMTneKsiyVNVYJzOLuxmARa/EEKfZld+J3rX4/o4cogrU38YSZF+T7J9g/7CTsnIZ3F6W6m+8iJbIBh55nGOQi5PVe458Q/nGb3fgQd2Z4+6lK9k479H4Ssh/Y7hbVQbepqEVIXzZKqWX6/ZE4iWoR/Q2dm0hySFmmB/R2etixX5JxhnHvgobTYIQ+1liJVp/3YFW1ru64Yg6yz/V291Bhh9g31znmTROCJ/usAmZZaLUqW1TDKnLIMP+M74MF9XERqcWKywXRFwxP4E5uDnx/vAyN49gL+SDfrBUxUtXrTkKZAlglwo9SgA7cOYEPWrionvKcGm87gCBYHFUmXZNQVzh212fpuJYXb/vy0sPDj8La4="
   chrome: stable
+  firefox: latest
 
 branches:
   only:
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index ee71934b54c5..71eef8c5c409 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -347,15 +347,12 @@ describe('MatSelectionList', () => {
     }));
 
     it('should be focused when focus on nativeElements', () => {
-      listOption.nativeElement.focus();
+      dispatchFakeEvent(listOption.nativeElement, 'focus');
       fixture.detectChanges();
 
-      expect(listItemEl.nativeElement).toBe(document.activeElement);
-      if (platform.SAFARI || platform.FIREFOX) {
-        expect(listItemEl.nativeElement.className).toContain('mat-list-item-focus');
-      }
+      expect(listItemEl.nativeElement.className).toContain('mat-list-item-focus');
 
-      listOption.nativeElement.blur();
+      dispatchFakeEvent(listOption.nativeElement, 'blur');
       fixture.detectChanges();
 
       expect(listItemEl.nativeElement.className).not.toContain('mat-list-item-focus');
diff --git a/test/browser-providers.js b/test/browser-providers.js
index ed2cd2ae0425..cc0c20584065 100644
--- a/test/browser-providers.js
+++ b/test/browser-providers.js
@@ -6,7 +6,7 @@
  */
 const browserConfig = {
   'ChromeHeadless_CI': { unitTest: {target: 'TC', required: true  }},
-  'Firefox':           { unitTest: {target: 'BS', required: true  }},
+  'FirefoxHeadless':   { unitTest: {target: 'TC', required: true  }},
   'ChromeBeta':        { unitTest: {target: null, required: false }},
   'FirefoxBeta':       { unitTest: {target: null, required: false }},
   'ChromeDev':         { unitTest: {target: null, required: true  }},
diff --git a/test/remote_browsers.json b/test/remote_browsers.json
index b1cd2ddbdc50..ae2c2cdce1c2 100644
--- a/test/remote_browsers.json
+++ b/test/remote_browsers.json
@@ -11,6 +11,12 @@
       "--window-size=1024,768"
     ]
   },
+  "FirefoxHeadless": {
+    "base": "Firefox",
+    "flags": [
+      "-headless"
+    ]
+  },
   "SL_CHROME": {
     "base": "SauceLabs",
     "browserName": "chrome",