diff --git a/tests/test-abort-checkin b/tests/test-abort-checkin
new file mode 100755
--- /dev/null
+++ b/tests/test-abort-checkin
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
+echo "[extensions]" >> $HGTMP/.hgrc
+echo "mq=" >> $HGTMP/.hgrc
+
+hg init foo
+cd foo
+echo foo > foo
+hg add foo
+
+# mq may keep a reference to the repository so __del__ will not be called
+# and .hg/journal.dirstate will not be deleted:
+HGEDITOR=false hg ci
+HGEDITOR=false hg ci
+
+exit 0
diff --git a/tests/test-abort-checkin.out b/tests/test-abort-checkin.out
new file mode 100644
--- /dev/null
+++ b/tests/test-abort-checkin.out
@@ -0,0 +1,6 @@
+abort: edit failed: false exited with status 1
+transaction abort!
+rollback completed
+abort: edit failed: false exited with status 1
+transaction abort!
+rollback completed