diff --git a/acceptance/bundle/exec/databricks-cli/profile-is-passed/output.txt b/acceptance/bundle/exec/databricks-cli/profile-is-passed/output.txt
index 1c1b74058..06cdd1c44 100644
--- a/acceptance/bundle/exec/databricks-cli/profile-is-passed/output.txt
+++ b/acceptance/bundle/exec/databricks-cli/profile-is-passed/output.txt
@@ -1,12 +1,12 @@
 
 >>> [CLI] bundle exec -- [CLI] current-user me
 {
-"id":"[USERID]",
-"userName":"[USERNAME]"
+  "id":"[USERID]",
+  "userName":"[USERNAME]"
 }
 
 >>> [CLI] bundle exec --profile myprofile -- [CLI] current-user me
 {
-"id":"[USERID]",
-"userName":"[USERNAME]"
+  "id":"[USERID]",
+  "userName":"[USERNAME]"
 }
diff --git a/acceptance/bundle/exec/databricks-cli/target-is-passed/output.txt b/acceptance/bundle/exec/databricks-cli/target-is-passed/output.txt
index 0fce7c1a7..84a9653e9 100644
--- a/acceptance/bundle/exec/databricks-cli/target-is-passed/output.txt
+++ b/acceptance/bundle/exec/databricks-cli/target-is-passed/output.txt
@@ -1,14 +1,14 @@
 
 >>> [CLI] bundle exec -- [CLI] current-user me
 {
-"id":"[USERID]",
-"userName":"[USERNAME]"
+  "id":"[USERID]",
+  "userName":"[USERNAME]"
 }
 
 >>> [CLI] bundle exec -t pat -- [CLI] current-user me
 {
-"id":"[USERID]",
-"userName":"[USERNAME]"
+  "id":"[USERID]",
+  "userName":"[USERNAME]"
 }
 
 >>> errcode [CLI] bundle exec -t pat -- [CLI] current-user me -t oauth
@@ -19,6 +19,6 @@ Exit code: 1
 
 >>> [CLI] bundle exec -t oauth -- [CLI] current-user me
 {
-"id":"[USERID]",
-"userName":"[USERNAME]"
+  "id":"[USERID]",
+  "userName":"[USERNAME]"
 }
diff --git a/cmd/bundle/exec.go b/cmd/bundle/exec.go
index e914f8844..4a1d7b0eb 100644
--- a/cmd/bundle/exec.go
+++ b/cmd/bundle/exec.go
@@ -112,37 +112,30 @@ Example usage:
 
 			var stdoutErr error
 			go func() {
-				reader := bufio.NewReader(stdout)
-				line, err := reader.ReadString('\n')
-				for err == nil {
-					_, err = fmt.Fprintf(cmd.OutOrStdout(), "%s\n", strings.TrimSpace(line))
+				defer wg.Done()
+
+				scanner := bufio.NewScanner(stdout)
+				for scanner.Scan() {
+					_, err = fmt.Fprintln(cmd.OutOrStdout(), scanner.Text())
 					if err != nil {
 						stdoutErr = err
 						break
 					}
-					line, err = reader.ReadString('\n')
 				}
-
-				wg.Done()
 			}()
 
 			var stderrErr error
 			go func() {
-				reader := bufio.NewReader(stderr)
-				// TODO CONTINUE: The formatting is messed u[] because of the new line business
-				// here.
-				// Fix that.
-				line, err := reader.ReadString('\n')
-				for err == nil {
-					_, err = fmt.Fprintf(cmd.ErrOrStderr(), "%s\n", strings.TrimSpace(line))
+				defer wg.Done()
+
+				scanner := bufio.NewScanner(stderr)
+				for scanner.Scan() {
+					_, err = fmt.Fprintln(cmd.ErrOrStderr(), scanner.Text())
 					if err != nil {
 						stderrErr = err
 						break
 					}
-					line, err = reader.ReadString('\n')
 				}
-
-				wg.Done()
 			}()
 
 			wg.Wait()