diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0dba307e1809..bdcbe619f576 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -121,7 +121,7 @@ jobs:
       - *restore_cache
       - *yarn_install
 
-      - run: xvfb-run -a --server-args='-screen 0, 1024x768x16' yarn gulp ci:e2e
+      - run: yarn gulp ci:e2e
 
       - *save_cache
 
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index 7f8ff4599f98..cbe5c5eb6590 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -36,6 +36,10 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
 
+    chromeOptions: {
+      args: [ '--headless', '--window-size=1024,768']
+    },
+
     // Enables concurrent testing in the Webdriver. Currently runs three e2e files in parallel.
     shardTestFiles: true,
     maxInstances: 5,