--- a/tests/test-exchange-A2.t	Mon Mar 03 13:12:50 2014 -0800
+++ b/tests/test-exchange-A2.t	Mon Mar 03 13:27:53 2014 -0800
@@ -33,16 +33,13 @@
 
 initial
 
-  $ mkdir A.2
-  $ cd A.2
-  $ hg init main
-  $ hg init pushdest
-  $ hg init pulldest
+  $ setuprepos A.2
+  creating test repo for test case A.2
+  - pulldest
+  - main
+  - pushdest
+  cd into `main` and proceed with env setup
   $ cd main
-  $ mkcommit O
-  $ hg phase --public .
-  $ hg push -q ../pushdest
-  $ hg push -q ../pulldest
   $ mkcommit A
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
   $ hg up .^