diff --git a/test/cli/dht_autoclient_test.go b/test/cli/dht_autoclient_test.go
index 749e34b348e..39aa5b258fe 100644
--- a/test/cli/dht_autoclient_test.go
+++ b/test/cli/dht_autoclient_test.go
@@ -20,6 +20,7 @@ func TestDHTAutoclient(t *testing.T) {
 	t.Run("file added on node in client mode is retrievable from node in client mode", func(t *testing.T) {
 		t.Parallel()
 		randomBytes := testutils.RandomBytes(1000)
+		randomBytes = append(randomBytes, '\r')
 		hash := nodes[8].IPFSAdd(bytes.NewReader(randomBytes))
 
 		res := nodes[9].IPFS("cat", hash)
diff --git a/test/cli/harness/buffer.go b/test/cli/harness/buffer.go
index b40e160b0d2..ba1cddf022d 100644
--- a/test/cli/harness/buffer.go
+++ b/test/cli/harness/buffer.go
@@ -25,11 +25,19 @@ func (b *Buffer) String() string {
 	return b.b.String()
 }
 
-// Trimmed returns the bytes as a string, with leading and trailing whitespace removed.
+// Trimmed returns the bytes as a string, but with the trailing newline removed.
+// This only removes a single trailing newline, not all whitespace.
 func (b *Buffer) Trimmed() string {
 	b.m.Lock()
 	defer b.m.Unlock()
-	return strings.TrimSpace(b.b.String())
+	s := b.b.String()
+	if len(s) == 0 {
+		return s
+	}
+	if s[len(s)-1] == '\n' {
+		return s[:len(s)-1]
+	}
+	return s
 }
 
 func (b *Buffer) Bytes() []byte {