diff --git a/.circleci/e2e.sh b/.circleci/e2e.sh
index c74b18b5e..2d9fc25af 100755
--- a/.circleci/e2e.sh
+++ b/.circleci/e2e.sh
@@ -25,5 +25,5 @@ if [[ "$BROWSERSTACK" == "true" && -n "$BROWSERSTACK_KEY" ]]; then
 else
   # When browserstack is not available test locally using chrome headless.
   echo Testing locally
-  node scripts/e2e.js --reports-folder "$REPORTS_FOLDER" --retries "$E2E_MAX_RETRIES" --timeout "$E2E_WAIT_FOR_TIMEOUT" --browsers "$E2E_BROWSERS"
+  node scripts/e2e.js --reports-folder "$REPORTS_FOLDER" --retries "$E2E_MAX_RETRIES" --timeout "$E2E_WAIT_FOR_TIMEOUT" --browsers "$E2E_BROWSERS" --headless
 fi
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index ac5887e51..64e5bcb31 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -49,5 +49,12 @@ module.exports = {
         },
       },
     },
+    'firefox-headless': {
+      desiredCapabilities: {
+        chromeOptions: {
+          args: ['--headless', '--disable-gpu', 'window-size=1600,1200'],
+        },
+      },
+    },
   },
 };