diff --git a/tests/test-completion.t b/tests/test-completion.t
--- a/tests/test-completion.t
+++ b/tests/test-completion.t
@@ -287,14 +287,15 @@ Show all commands + options
   $ cd a
   $ echo fee > fee
   $ hg ci -q -Amfee
+  $ hg tag fee
   $ mkdir fie
   $ echo dead > fie/dead
   $ echo live > fie/live
   $ hg bookmark fo
-  $ hg branch fie
+  $ hg branch -q fie
   $ hg ci -q -Amfie
   $ echo fo > fo
-  $ hg branch default
+  $ hg branch -qf default
   $ hg ci -q -Amfo
   $ echo Fum > Fum
   $ hg ci -q -AmFum
@@ -303,16 +304,33 @@ Show all commands + options
 Test debugpathcomplete
 
   $ hg debugpathcomplete f
+  fee
+  fie/
+  fo
   $ hg debugpathcomplete -f f
+  fee
+  fie/dead
+  fie/live
+  fo
 
   $ hg rm Fum
   $ hg debugpathcomplete -r F
+  Fum
 
 If one directory and no files match, give an ambiguous answer
 
   $ hg debugpathcomplete fi
+  fie/
+  fie/.
 
 Test debuglabelcomplete
 
   $ hg debuglabelcomplete
+  Fum
+  default
+  fee
+  fo
+  tip
   $ hg debuglabelcomplete f
+  fee
+  fo