diff --git a/util/build-gnu.sh b/util/build-gnu.sh
index e2c67539441..324127d3561 100755
--- a/util/build-gnu.sh
+++ b/util/build-gnu.sh
@@ -197,6 +197,11 @@ sed -i -e "s|rm: cannot remove 'a/1'|rm: cannot remove 'a'|g" tests/rm/rm2.sh
 
 sed -i -e "s|removed directory 'a/'|removed directory 'a'|g" tests/rm/v-slash.sh
 
+if test "$(grep -c 'rm: skipping '  tests/rm/one-file-system.sh)" -eq 1; then
+     # Do it only once.
+     sed -i -e "s|rm: skipping 'a/b'|rm: skipping 'a'|g" -e "s/ >> exp/ > exp/g"  -e "s|rm: and --preserve-root=all is in effect|rm: skipping 'a/b', since it's on a different device\nrm: and --preserve-root=all is in effect|g" tests/rm/one-file-system.sh
+fi
+
 # 'rel' doesn't exist. Our implementation is giving a better message.
 sed -i -e "s|rm: cannot remove 'rel': Permission denied|rm: cannot remove 'rel': No such file or directory|g" tests/rm/inaccessible.sh