diff --git a/circle.yml b/circle.yml
index 4bbb2d946..131248ebe 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-ci
+    - REPORTS_FOLDER=$CIRCLE_TEST_REPORTS/browserstack yarn e2e-ci
 
 deployment:
   release:
diff --git a/nightwatch-browserstack.conf.js b/nightwatch-browserstack.conf.js
index 190bdad66..40ded315c 100644
--- a/nightwatch-browserstack.conf.js
+++ b/nightwatch-browserstack.conf.js
@@ -4,7 +4,7 @@ const {
 
 const nightwatch_config = {
   src_folders: './test/e2e/specs/',
-  output_folder: './test/e2e/reports',
+  output_folder: process.env.REPORTS_FOLDER || './test/e2e/reports',
   page_objects_path: './test/e2e/page_objects',
   globals_path: './test/e2e/globals',
 
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index 48dd9dd1a..44bb94272 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -4,7 +4,7 @@ const {
 
 module.exports = {
   src_folders: './test/e2e/specs/',
-  output_folder: './test/e2e/reports',
+  output_folder: process.env.REPORTS_FOLDER || './test/e2e/reports',
   page_objects_path: './test/e2e/page_objects',
   globals_path: './test/e2e/globals',
   selenium: {