diff --git a/.travis.yml b/.travis.yml
index 3cd5d38c2..6f2204805 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,33 +5,18 @@ node_js:
 
 addons:
   chrome: stable
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
 
 cache: npm
 
-env:
-  - CXX=g++-4.8
+branches:
+  only:
+    - master # otherwise pull requests get built twice
 
 install:
-  # ditched yarn, since it was acting up and giving old versions of tsc
-  - npm install
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - yarn install
 
 script:
-  - npm run build
-  - ./node_modules/.bin/karma start --single-run --browsers Firefox --reporters mocha
+  - yarn run build
+  - ./node_modules/.bin/karma start --single-run --browsers ChromeHeadlessTravis --reporters mocha
   # Run integration test to make sure our typings are correct for user-land.
   - node tools/run-typings-test.js
-
-notifications:
-  webhooks:
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
diff --git a/karma.conf.js b/karma.conf.js
index 2001e0c4e..fdcc90cc8 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -41,8 +41,14 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     reporters: ['mocha'],
-    browsers: ['Firefox'],
-    singleRun: false
+    browsers: ['Chrome', 'ChromeHeadless', 'Firefox', 'ChromeHeadlessTravis'],
+    singleRun: false,
+    customLaunchers: {
+      ChromeHeadlessTravis: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox']
+      }
+    },
   })
 };
 
diff --git a/tools/run-typings-test.js b/tools/run-typings-test.js
index ae1f4b432..c5a2327d0 100644
--- a/tools/run-typings-test.js
+++ b/tools/run-typings-test.js
@@ -35,7 +35,7 @@ ncp(pathToTestSrcFolder, pathToTestFolder, () => {
     .replace('{{TYPESCRIPT_VERSION}}', rootPackage.devDependencies.typescript)
     .replace(/\{\{ANGULAR_VERSION\}\}/g, rootPackage.dependencies['@angular/core']));
 
-    spawnIt('npm', ['install'])
+    spawnIt('yarn', ['install'])
       .then(_ => spawnIt(`${pathToTestFolder}/node_modules/.bin/tsc`, ['--version']))
       .then(_ => new Promise((res, rej) => {
         child_process.exec(`${pathToTestFolder}/node_modules/.bin/tsc --diagnostics -p ${pathToTestFolder}/tsconfig-test.json`, (err, stdout, stderr) => {