diff --git a/tests/test-rank.t b/tests/test-rank.t
new file mode 100644
--- /dev/null
+++ b/tests/test-rank.t
@@ -0,0 +1,42 @@
+=============================================================
+Check that we can compute and exchange revision rank properly
+=============================================================
+
+  $ cat << EOF >> $HGRCPATH
+  > [format]
+  > exp-use-changelog-v2=enable-unstable-format-and-corrupt-my-data
+  > EOF
+
+
+Test minimal rank computation with merge
+
+  $ hg init rank-repo-minimal
+  $ cd rank-repo-minimal
+  $ touch 0
+  $ hg add 0
+  $ hg commit -m 0
+  $ touch 1
+  $ hg add 1
+  $ hg commit -m 1
+  $ hg update -r 0 >> /dev/null
+  $ touch 2
+  $ hg add 2
+  $ hg commit -m 2 >> /dev/null
+  $ hg merge -r 1 >> /dev/null
+  $ hg commit -m 3
+  $ touch 4
+  $ hg add 4
+  $ hg commit -m 4
+  $ hg log --graph --template '{rev} {_fast_rank}\n'
+  @  4 5
+  |
+  o    3 4
+  |\
+  | o  2 2
+  | |
+  o |  1 2
+  |/
+  o  0 1
+  
+  $ cd ..
+