diff --git a/circle.yml b/circle.yml
index f6b35970c..a2e73ccce 100644
--- a/circle.yml
+++ b/circle.yml
@@ -19,10 +19,17 @@ dependencies:
     # - sudo apt-get install -y mongodb-org
     # - sudo service mongod restart
 
+    # Install chromium for e2e and remove old google-chrome
+    - sudo rm -rf /opt/google/chrome
+    - sudo rm -f /usr/bin/google-chrome*
+    - sudo apt-get update
+    - sudo apt-get install chromium-browser
+
     # Install node dependencies.
     - yarn --version
     - yarn global add node-gyp --force
     - yarn
+
   post:
     # Build the static assets.
     - yarn build
@@ -40,6 +47,7 @@ test:
   override:
     # Run the tests using the junit reporter.
     - MOCHA_FILE=$CIRCLE_TEST_REPORTS/junit/test-results.xml MOCHA_REPORTER=mocha-junit-reporter yarn test
+    - yarn e2e -- --env ci
 
 deployment:
   release:
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index 57034cdea..c12684e87 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -39,6 +39,13 @@ module.exports = {
         path: './test/e2e/tests_output'
       },
     },
+    ci: {
+      desiredCapabilities: {
+        chromeOptions : {
+          args: ['--headless', '--disable-gpu']
+        },
+      },
+    },
     headless: {
       desiredCapabilities: {
         chromeOptions : {