--- a/tests/test-exchange-B6.t	Tue Mar 14 14:47:20 2017 -0700
+++ b/tests/test-exchange-B6.t	Fri Mar 31 15:44:10 2017 +0200
@@ -4,7 +4,7 @@
 
 Initial setup
 
-  $ . $TESTDIR/_exc-util.sh
+  $ . $TESTDIR/testlib/exchange-util.sh
 
 == B.6 Pruned changeset with ancestors not in pushed set ===
 
@@ -61,11 +61,11 @@
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 f2e05412d3f1d5bc1ae647cf9efc43e0399c26ca
   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b 974507d1c466d0aa86d288836194339ed3b98736
   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 04e03a8959d8a39984e6a8f4a16fba975b364747
-  $ hg debugstablerange --rev 'head()'
-  rev         node index size depth      obshash
-    1 f5bc6836db60     0    2     2 000000000000
-    0 a9bdc8b26820     0    1     1 86e41541149f
-    1 f5bc6836db60     1    1     2 000000000000
+  $ hg debugobshashrange --subranges --rev 'head()'
+           rev         node        index         size        depth      obshash
+             1 f5bc6836db60            0            2            2 000000000000
+             0 a9bdc8b26820            0            1            1 86e41541149f
+             1 f5bc6836db60            1            1            2 000000000000
   $ cd ..
   $ cd ..