diff --git a/.gitignore b/.gitignore
index 32fd646df..1f87b52bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,8 @@ client/coral-framework/graphql/introspection.json
 *.DS_STORE
 
 coverage/
-tests_output/
-local.log
+test/e2e/tests_output/
+test/e2e/bslocal.log
 
 plugins.json
 plugins/*
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index 2e8bc65fa..50b0b5a80 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -1,5 +1,6 @@
 const nightwatch_config = {
   src_folders: './test/e2e/specs/',
+  output_folder: './test/e2e/tests_output',
 
   selenium : {
     'start_process': false,
diff --git a/scripts/e2e.js b/scripts/e2e.js
index 18ec65b8d..3b36da8d6 100755
--- a/scripts/e2e.js
+++ b/scripts/e2e.js
@@ -10,7 +10,10 @@ try {
   // Code to start browserstack local before start of test
   console.log('Connecting local');
   Nightwatch.bs_local = bs_local;
-  bs_local.start({'key': process.env.BROWSERSTACK_KEY}, function(error) {
+  bs_local.start({
+    'key': process.env.BROWSERSTACK_KEY,
+    'logFile': './test/e2e/bslocal.log'
+  }, function(error) {
     if (error) {
       console.error(error);
       throw error;