diff --git a/e2etestrunner.js b/e2etestrunner.js
index c787cf5..c81b7ac 100755
--- a/e2etestrunner.js
+++ b/e2etestrunner.js
@@ -86,7 +86,8 @@ function runTests(latestVersionInfo, callback) {
 
         var topic = util.format('E2E Test %s for box version: %s', error ? 'failed': 'passed', latestVersionInfo.version);
 
-        mailer.sendEndToEndTestResult(topic, JSON.stringify(latestVersionInfo, null, 4), stdout ? stdout.toString('utf8') : '', stderr ? stderr.toString('utf8') : '', function () { });
+        // do not send stderr in mail since it contains the tail log stream
+        mailer.sendEndToEndTestResult(topic, JSON.stringify(latestVersionInfo, null, 4), stdout ? stdout.toString('utf8') : '', '', function () { });
         return callback(error);
     });
 }
diff --git a/parallel_test.sh b/parallel_test.sh
index f7ffb7f..339120d 100755
--- a/parallel_test.sh
+++ b/parallel_test.sh
@@ -28,8 +28,8 @@ sleep 20 # wait for the other tests to have created the cloudron
 test_pids+=("$!")
 test_logs+=("logs/cloudron-update-test.log")
 
-# stream all the logs
-tail -f ${test_logs[*]} &
+# stream all the logs (to stderr so that it's not in email but in deploy logs)
+tail -f ${test_logs[*]} >&2 &
 
 # wait for tests to finish
 fail=0