--- a/tests/test-tags.t	Thu Apr 16 11:32:46 2015 -0400
+++ b/tests/test-tags.t	Thu Apr 16 11:54:13 2015 -0400
@@ -9,7 +9,7 @@
 Helper functions:
 
   $ cacheexists() {
-  >   [ -f .hg/cache/tags-visible ] && echo "tag cache exists" || echo "no tag cache"
+  >   [ -f .hg/cache/tags2-visible ] && echo "tag cache exists" || echo "no tag cache"
   > }
 
   $ fnodescacheexists() {
@@ -56,7 +56,7 @@
 
 Try corrupting the cache
 
-  $ printf 'a b' > .hg/cache/tags-visible
+  $ printf 'a b' > .hg/cache/tags2-visible
   $ hg identify
   acb14030fe0a tip
   $ cacheexists
@@ -102,7 +102,7 @@
 
 Repeat with cold tag cache:
 
-  $ rm -f .hg/cache/tags-visible .hg/cache/hgtagsfnodes1
+  $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ hg identify
   b9154636be93 tip
 
@@ -117,7 +117,7 @@
 And again, but now unable to write tag cache:
 
 #if unix-permissions
-  $ rm -f .hg/cache/tags-visible .hg/cache/hgtagsfnodes1
+  $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ chmod 555 .hg/cache
   $ hg identify
   b9154636be93 tip
@@ -126,7 +126,7 @@
 
 Tag cache debug info written to blackbox log
 
-  $ rm -f .hg/cache/tags-visible .hg/cache/hgtagsfnodes1
+  $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ hg identify
   b9154636be93 tip
   $ hg blackbox -l 5
@@ -138,7 +138,7 @@
 
 Failure to acquire lock results in no write
 
-  $ rm -f .hg/cache/tags-visible .hg/cache/hgtagsfnodes1
+  $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ echo 'foo:1' > .hg/wlock
   $ hg identify
   b9154636be93 tip
@@ -154,7 +154,7 @@
 
   $ rm .hg/wlock
 
-  $ rm -f .hg/cache/tags-visible .hg/cache/hgtagsfnodes1
+  $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ hg identify
   b9154636be93 tip
 
@@ -311,7 +311,7 @@
 
 Dump cache:
 
-  $ cat .hg/cache/tags-visible
+  $ cat .hg/cache/tags2-visible
   4 0c192d7d5e6b78a714de54a2e9627952a877e25a
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
@@ -353,7 +353,7 @@
   $ hg commit -m throwaway2
 
   $ chmod a-w .hg/cache/hgtagsfnodes1
-  $ rm -f .hg/cache/tags-visible
+  $ rm -f .hg/cache/tags2-visible
 
   $ hg tags
   tip                                6:b968051b5cf3
@@ -369,7 +369,7 @@
   $ chmod a+w .hg/cache/hgtagsfnodes1
 #endif
 
-  $ rm -f .hg/cache/tags-visible
+  $ rm -f .hg/cache/tags2-visible
   $ hg tags
   tip                                6:b968051b5cf3
   bar                                1:78391a272241
@@ -521,7 +521,7 @@
   $ hg tags                  # partly stale
   tip                                4:735c3ca72986
   bar                                0:bbd179dfa0a7
-  $ rm -f .hg/cache/tags-visible
+  $ rm -f .hg/cache/tags2-visible
   $ hg tags                  # cold cache
   tip                                4:735c3ca72986
   bar                                0:bbd179dfa0a7