diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
--- a/tests/test-histedit-arguments.t
+++ b/tests/test-histedit-arguments.t
@@ -308,6 +308,28 @@
   $ echo xx >> x
   $ hg --encoding utf-8 commit --logfile logfile
 
+Editor code calls util.tonativeeol, which only inserts CRLF on Python 3 on Windows.
+#if py3 windows
+  $ HGEDITOR=cat hg --encoding utf-8 histedit tip
+  pick 3d3ea1f3a10b 5 1234567890123456789012345678901234567890123456789012345\xe3\x81\x82...\r (esc)
+  \r (esc)
+  # Edit history between 3d3ea1f3a10b and 3d3ea1f3a10b\r (esc)
+  #\r (esc)
+  # Commits are listed from least to most recent\r (esc)
+  #\r (esc)
+  # You can reorder changesets by reordering the lines\r (esc)
+  #\r (esc)
+  # Commands:\r (esc)
+  #\r (esc)
+  #  e, edit = use commit, but stop for amending\r (esc)
+  #  m, mess = edit commit message without changing commit content\r (esc)
+  #  p, pick = use commit\r (esc)
+  #  b, base = checkout changeset and apply further changesets from there\r (esc)
+  #  d, drop = remove commit from history\r (esc)
+  #  f, fold = use commit, but combine it with the one above\r (esc)
+  #  r, roll = like fold, but discard this commit's description and date\r (esc)
+  #\r (esc)
+#else
   $ HGEDITOR=cat hg --encoding utf-8 histedit tip
   pick 3d3ea1f3a10b 5 1234567890123456789012345678901234567890123456789012345\xe3\x81\x82... (esc)
   
@@ -327,6 +349,7 @@
   #  f, fold = use commit, but combine it with the one above
   #  r, roll = like fold, but discard this commit's description and date
   #
+#endif
 
 Test --continue with --keep