--- a/tests/test-topic-stack.t	Sat Sep 01 14:00:41 2018 +0200
+++ b/tests/test-topic-stack.t	Mon Sep 03 16:29:02 2018 +0200
@@ -241,15 +241,18 @@
 -------------------
 
 
-  $ hg up t2
-  abort: cannot resolve "t2": no active topic
+  $ hg up s2
+  abort: cannot resolve "s2": branch "default" has only 0 changesets
   [255]
   $ hg topic foo
   marked working directory as topic: foo
   $ hg up t42
   abort: cannot resolve "t42": topic "foo" has only 4 changesets
   [255]
-  $ hg up t2
+  $ hg up s42
+  abort: cannot resolve "s42": topic "foo" has only 4 changesets
+  [255]
+  $ hg up s2
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg summary
   parent: 3:e629654d7050 
@@ -289,7 +292,7 @@
   t2@ c_d (current)
   t1: c_c
   t0^ c_b (base)
-  $ hg up t3
+  $ hg up s3
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg topic --list
   ### topic: foo
@@ -307,7 +310,7 @@
   [topic.stack.index topic.stack.index.clean|t2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d]
   [topic.stack.index topic.stack.index.clean|t1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c]
   [topic.stack.index topic.stack.index.base|t0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)]
-  $ hg up t2
+  $ hg up s2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Also test the revset:
@@ -807,12 +810,12 @@
 
 get things linear again
 
-  $ hg rebase -r t1 -d default
+  $ hg rebase -r s1 -d default
   rebasing 16:1d84ec948370 "c_D" (tip blue)
   switching to topic blue
-  $ hg rebase -r t2 -d t1
+  $ hg rebase -r s2 -d s1
   rebasing 13:3ab2eedae500 "c_G" (blue)
-  $ hg rebase -r t3 -d t2
+  $ hg rebase -r s3 -d s2
   rebasing 8:3bfe800e0486 "c_I" (blue)
   $ hg stack
   ### topic: blue
@@ -825,7 +828,7 @@
 making a split
 (first get something to split)
 
-  $ hg up t2
+  $ hg up s2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status --change .
   A ggg