diff --git a/circle.yml b/circle.yml
index a2e73ccce..00e24ee89 100644
--- a/circle.yml
+++ b/circle.yml
@@ -47,7 +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
+    - yarn e2e -- --env chrome-headless
 
 deployment:
   release:
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index c12684e87..48dd9dd1a 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -14,7 +14,8 @@ module.exports = {
     host: '127.0.0.1',
     port: 6666,
     cli_args: {
-      'webdriver.chrome.driver': 'node_modules/selenium-standalone/.selenium/chromedriver/2.32-x64-chromedriver'
+      'webdriver.chrome.driver': 'node_modules/selenium-standalone/.selenium/chromedriver/2.32-x64-chromedriver',
+      'webdriver.gecko.driver': 'node_modules/selenium-standalone/.selenium/geckodriver/0.18.0-x64-geckodriver',
     }
   },
   test_settings: {
@@ -39,14 +40,7 @@ module.exports = {
         path: './test/e2e/tests_output'
       },
     },
-    ci: {
-      desiredCapabilities: {
-        chromeOptions : {
-          args: ['--headless', '--disable-gpu']
-        },
-      },
-    },
-    headless: {
+    'chrome-headless': {
       desiredCapabilities: {
         chromeOptions : {
           args: ['--headless', '--disable-gpu']