diff --git a/tests/functional/repl.sh b/tests/functional/repl.sh
index a6c075abd..a149916ac 100755
--- a/tests/functional/repl.sh
+++ b/tests/functional/repl.sh
@@ -262,14 +262,23 @@ badExitCode=0
 
 nixVersion="$(nix eval --impure --raw --expr 'builtins.nixVersion' --extra-experimental-features nix-command)"
 
+# TODO: write a repl interacter for testing. Papering over the differences between readline / editline and between platforms is a pain.
+
 # I couldn't get readline and editline to agree on the newline before the prompt,
-# so let's just force it to be one empty line. Ideally we get the two to agree
-# or use a simpler interacter for testing.
+# so let's just force it to be one empty line.
 stripEmptyLinesBeforePrompt() {
   # --null-data:  treat input as NUL-terminated instead of newline-terminated
   sed --null-data 's/\n\n*nix-repl>/\n\nnix-repl>/g'
 }
 
+# We don't get a final prompt on darwin, so we strip this as well.
+stripFinalPrompt() {
+  # Strip the final prompt and/or any trailing spaces
+  sed --null-data \
+    -e 's/\(.*[^\n]\)\n\n*nix-repl>[ \n]*$/\1/' \
+    -e 's/[ \n]*$/\n/'
+}
+
 runRepl () {
 
   # That is right, we are also filtering out the testdir _without underscores_.
@@ -285,7 +294,9 @@ runRepl () {
   _NIX_TEST_REPL_ECHO=1 \
   nix repl 2>&1 \
     | stripColors \
+    | tr -d '\0' \
     | stripEmptyLinesBeforePrompt \
+    | stripFinalPrompt \
     | sed \
       -e "s@$testDir@/path/to/tests/functional@g" \
       -e "s@$testDirNoUnderscores@/path/to/tests/functional@g" \
diff --git a/tests/functional/repl/doc-comment-curried-args.expected b/tests/functional/repl/doc-comment-curried-args.expected
index f97f593c6..56607e911 100644
--- a/tests/functional/repl/doc-comment-curried-args.expected
+++ b/tests/functional/repl/doc-comment-curried-args.expected
@@ -26,5 +26,3 @@ nix-repl> "This won't produce docs; no support for arbitrary values"
 
 nix-repl> :doc x 2
 error: value does not have documentation
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-comment-formals.expected b/tests/functional/repl/doc-comment-formals.expected
index 4c9757f89..1024919f4 100644
--- a/tests/functional/repl/doc-comment-formals.expected
+++ b/tests/functional/repl/doc-comment-formals.expected
@@ -12,5 +12,3 @@ Function `documentedFormals`\
   … defined at /path/to/tests/functional/repl/doc-comments.nix:57:5
 
 Finds x
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-comment-function.expected b/tests/functional/repl/doc-comment-function.expected
index 9718ccc66..3889c4f78 100644
--- a/tests/functional/repl/doc-comment-function.expected
+++ b/tests/functional/repl/doc-comment-function.expected
@@ -5,5 +5,3 @@ nix-repl> :doc import ./doc-comment-function.nix
 Function defined at /path/to/tests/functional/repl/doc-comment-function.nix:2:1
 
 A doc comment for a file that only contains a function
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-compact.expected b/tests/functional/repl/doc-compact.expected
index 17603d813..79f1fd44f 100644
--- a/tests/functional/repl/doc-compact.expected
+++ b/tests/functional/repl/doc-compact.expected
@@ -9,5 +9,3 @@ Function `compact`\
   … defined at /path/to/tests/functional/repl/doc-comments.nix:18:20
 
 boom
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-constant.expected b/tests/functional/repl/doc-constant.expected
index e0092453e..5787e04dc 100644
--- a/tests/functional/repl/doc-constant.expected
+++ b/tests/functional/repl/doc-constant.expected
@@ -108,5 +108,3 @@ error:
             1| lib.attr.undocumental
              | ^
        Did you mean undocumented?
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-floatedIn.expected b/tests/functional/repl/doc-floatedIn.expected
index d3f1c3f65..82bb80b95 100644
--- a/tests/functional/repl/doc-floatedIn.expected
+++ b/tests/functional/repl/doc-floatedIn.expected
@@ -9,5 +9,3 @@ Function `floatedIn`\
   … defined at /path/to/tests/functional/repl/doc-comments.nix:16:5
 
 This also works.
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-lambda-flavors.expected b/tests/functional/repl/doc-lambda-flavors.expected
index 268cac05e..ab5c95639 100644
--- a/tests/functional/repl/doc-lambda-flavors.expected
+++ b/tests/functional/repl/doc-lambda-flavors.expected
@@ -27,5 +27,3 @@ Function `strictPost`\
   … defined at /path/to/tests/functional/repl/doc-comments.nix:41:53
 
 Here's another way to do this
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-measurement.expected b/tests/functional/repl/doc-measurement.expected
index 14ae11e80..555cac9a2 100644
--- a/tests/functional/repl/doc-measurement.expected
+++ b/tests/functional/repl/doc-measurement.expected
@@ -9,5 +9,3 @@ Function `measurement`\
   … defined at /path/to/tests/functional/repl/doc-comments.nix:13:17
 
 👈 precisely this wide 👉
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-multiply.expected b/tests/functional/repl/doc-multiply.expected
index 5cefda516..21523e24c 100644
--- a/tests/functional/repl/doc-multiply.expected
+++ b/tests/functional/repl/doc-multiply.expected
@@ -15,5 +15,3 @@ Perform *arithmetic* multiplication. It's kind of like repeated **addition**, ve
 multiply 2 3
 => 6
 ```
-
-nix-repl> 
diff --git a/tests/functional/repl/doc-unambiguous.expected b/tests/functional/repl/doc-unambiguous.expected
index 0872750a1..0db5505d7 100644
--- a/tests/functional/repl/doc-unambiguous.expected
+++ b/tests/functional/repl/doc-unambiguous.expected
@@ -9,5 +9,3 @@ Function `unambiguous`\
   … defined at /path/to/tests/functional/repl/doc-comments.nix:24:5
 
 Very close
-
-nix-repl> 
diff --git a/tests/functional/repl/pretty-print-idempotent.expected b/tests/functional/repl/pretty-print-idempotent.expected
index f09aec88d..311855dae 100644
--- a/tests/functional/repl/pretty-print-idempotent.expected
+++ b/tests/functional/repl/pretty-print-idempotent.expected
@@ -35,5 +35,3 @@ nix-repl> twoDeepList
 [
   [ ... ]
 ]
-
-nix-repl>