diff --git a/tests/test-bookmarks-current b/tests/test-bookmarks-current
new file mode 100755
--- /dev/null
+++ b/tests/test-bookmarks-current
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+echo "[extensions]" >> $HGRCPATH
+echo "bookmarks=" >> $HGRCPATH
+
+echo "[bookmarks]" >> $HGRCPATH
+echo "track.current = True" >> $HGRCPATH
+
+hg init
+
+echo % no bookmarks
+hg bookmarks
+
+echo % set bookmark X
+hg bookmark X
+
+echo % update to bookmark X
+hg update X
+
+echo % list bookmarks
+hg bookmarks
+
+echo % rename
+hg bookmark -m X Z
+
+echo % list bookmarks
+hg bookmarks
+
+echo % new bookmark Y
+hg bookmark Y
+
+echo % list bookmarks
+hg bookmark
+
+echo % commit
+echo 'b' > b
+hg add b
+hg commit -m'test'
+
+echo % list bookmarks
+hg bookmark
diff --git a/tests/test-bookmarks-current.out b/tests/test-bookmarks-current.out
new file mode 100644
--- /dev/null
+++ b/tests/test-bookmarks-current.out
@@ -0,0 +1,18 @@
+% no bookmarks
+no bookmarks set
+% set bookmark X
+% update to bookmark X
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% list bookmarks
+ * X                         -1:000000000000
+% rename
+% list bookmarks
+ * Z                         -1:000000000000
+% new bookmark Y
+% list bookmarks
+   Y                         -1:000000000000
+ * Z                         -1:000000000000
+% commit
+% list bookmarks
+   Y                         -1:000000000000
+ * Z                         0:719295282060