diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t
--- a/tests/test-histedit-non-commute.t
+++ b/tests/test-histedit-non-commute.t
@@ -300,4 +300,7 @@
      summary:     Initial commit
   
 
+An invalid editor shouldn't leave the user in a broken state:
+  $ EDITOR=totally-not-a-thing-unsensible-editor-value hg histedit 4
+
   $ cd ..