diff --git a/.travis.yml b/.travis.yml
index bc539060e7..0a9ae4754f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,7 @@
 sudo: required
 dist: trusty
 addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
+  - chrome: stable
 
 language: node_js
 
@@ -24,14 +20,7 @@ before_install:
 install:
   - travis_retry yarn install
 
-before_script:
-  - travis_wait yarn run lint
-  - travis_wait yarn run build
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - sleep 3
-
 script:
+  - yarn run build
   - yarn run ci
   - cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
diff --git a/karma.conf.js b/karma.conf.js
index e43191d8ee..073ce7040b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -146,11 +146,6 @@ module.exports = function (config) {
     ],
 
     customLaunchers: {
-      // Continuous integraation with Chrome - launcher
-      'ChromeTravisCi': {
-        base: 'Chrome',
-        flags: ['--no-sandbox']
-      },
       // Remote Selenium Server with Chrome - launcher
       'SeleniumChrome': {
         base: 'WebDriver',
@@ -173,9 +168,5 @@ module.exports = function (config) {
 
   };
 
-  if (process.env.TRAVIS) {
-    configuration.browsers = ['ChromeTravisCi'];
-  }
-
   config.set(configuration);
 };
diff --git a/package.json b/package.json
index 2f74dd6cb8..e32a9af765 100644
--- a/package.json
+++ b/package.json
@@ -55,11 +55,12 @@
     "debug:server": "node-nightly --inspect --debug-brk dist/server.js",
     "debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js",
     "debug:build:prod": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --env.aot --env.client --env.server -p",
-    "ci": "yarn run lint && yarn run build:aot && yarn run test && npm-run-all -p -r server e2e",
+    "ci": "yarn run lint && yarn run build:aot && yarn run test:headless && npm-run-all -p -r server e2e",
     "protractor": "node node_modules/protractor/bin/protractor",
     "pree2e": "yarn run webdriver:update",
     "e2e": "yarn run protractor",
     "test": "karma start --single-run",
+    "test:headless": "karma start --single-run --browsers ChromeHeadless",
     "test:watch": "karma start --no-single-run --auto-watch",
     "webdriver:start": "node node_modules/protractor/bin/webdriver-manager start --seleniumPort 4444",
     "webdriver:update": "node node_modules/protractor/bin/webdriver-manager update --standalone",
diff --git a/protractor.conf.js b/protractor.conf.js
index 618a5efc08..2949702a0a 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -31,7 +31,10 @@ exports.config = {
   capabilities: {
     'browserName': 'chrome',
     'version': '',
-    'platform': 'ANY'
+    'platform': 'ANY',
+    'chromeOptions': {
+      'args': [ '--headless', '--disable-gpu' ]
+    }
   },
   // -----------------------------------------------------------------
   // Browser and Capabilities: Firefox