diff --git a/src/redis-cli.c b/src/redis-cli.c
index 33919758ee1da0b08b333c08e2f16c138cfdf1c4..df4c2517f2482c548162fecb6bc8b7590dd6aa7d 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -226,7 +226,7 @@ static int cliReadReply(int fd) {
     case '*':
         return cliReadMultiBulkReply(fd);
     default:
-        printf("protocol error, got '%c' as reply type byte\n", type);
+        printf("protocol error, got '%c' as reply type byte", type);
         return 1;
     }
 }
@@ -294,12 +294,8 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
         }
 
         retval = cliReadReply(fd);
-        if (retval) {
-            return retval;
-        }
-        if (!config.raw_output && config.tty) {
-            printf("\n");
-        }
+        if (!config.raw_output && config.tty) printf("\n");
+        if (retval) return retval;
     }
     return 0;
 }
diff --git a/tests/integration/redis-cli.tcl b/tests/integration/redis-cli.tcl
index c4954304016bc75cf9688be72b7c8ca4706913d8..4f180dafbc385b47d2ca295c6b87669757c04632 100644
--- a/tests/integration/redis-cli.tcl
+++ b/tests/integration/redis-cli.tcl
@@ -36,9 +36,11 @@ start_server {tags {"cli"}} {
     }
 
     proc test_interactive_cli {name code} {
+        set ::env(FAKETTY) 1
         set fd [open_cli]
         test "Interactive CLI: $name" $code
         close_cli $fd
+        unset ::env(FAKETTY)
     }
 
     proc run_nontty_cli {args} {