diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -94,7 +94,18 @@
   linking: 6
   linking: 7
   linking: 8
-  linked 8 files
+  linked 8 files (reporevlogstore !)
+  linking: 9 (reposimplestore !)
+  linking: 10 (reposimplestore !)
+  linking: 11 (reposimplestore !)
+  linking: 12 (reposimplestore !)
+  linking: 13 (reposimplestore !)
+  linking: 14 (reposimplestore !)
+  linking: 15 (reposimplestore !)
+  linking: 16 (reposimplestore !)
+  linking: 17 (reposimplestore !)
+  linking: 18 (reposimplestore !)
+  linked 18 files (reposimplestore !)
 #else
   $ hg --debug clone -U . ../c --config progress.debug=true
   linking: 1
@@ -105,7 +116,18 @@
   copying: 6
   copying: 7
   copying: 8
-  copied 8 files
+  copied 8 files (reporevlogstore !)
+  copying: 9 (reposimplestore !)
+  copying: 10 (reposimplestore !)
+  copying: 11 (reposimplestore !)
+  copying: 12 (reposimplestore !)
+  copying: 13 (reposimplestore !)
+  copying: 14 (reposimplestore !)
+  copying: 15 (reposimplestore !)
+  copying: 16 (reposimplestore !)
+  copying: 17 (reposimplestore !)
+  copying: 18 (reposimplestore !)
+  copied 18 files (reposimplestore !)
 #endif
   $ cd ../c
 
diff --git a/tests/test-convert-hg-source.t b/tests/test-convert-hg-source.t
--- a/tests/test-convert-hg-source.t
+++ b/tests/test-convert-hg-source.t
@@ -169,7 +169,12 @@
 
 break it
 
+#if reporevlogstore
   $ rm .hg/store/data/b.*
+#endif
+#if reposimplestore
+  $ rm .hg/store/data/b/*
+#endif
   $ cd ..
   $ hg --config convert.hg.ignoreerrors=True convert broken fixed
   initializing destination fixed repository
diff --git a/tests/test-narrow.t b/tests/test-narrow.t
--- a/tests/test-narrow.t
+++ b/tests/test-narrow.t
@@ -127,8 +127,12 @@
   The following changeset(s) or their ancestors have local changes not on the remote:
   * (glob)
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
-  deleting data/d0/f.i
+  deleting data/d0/f.i (reporevlogstore !)
+  deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
+  deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
+  deleting data/d0/f/index (reposimplestore !)
   deleting meta/d0/00manifest.i (tree !)
+
   $ hg log -T "{node|short}: {desc} {outsidenarrow}\n"
   *: local change to d3  (glob)
   *: add d10/f outsidenarrow (glob)
@@ -154,8 +158,12 @@
   searching for changes
   looking for local changes to affected paths
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
-  deleting data/d0/f.i
+  deleting data/d0/f.i (reporevlogstore !)
+  deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
+  deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
+  deleting data/d0/f/index (reposimplestore !)
   deleting meta/d0/00manifest.i (tree !)
+
 Updates off of stripped commit if necessary
   $ hg co -r 'desc("local change to d3")' -q
   $ echo local change >> d6/f
@@ -169,7 +177,10 @@
   * (glob)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
-  deleting data/d3/f.i
+  deleting data/d3/f.i (reporevlogstore !)
+  deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
+  deleting data/d3/f/99fa7136105a15e2045ce3d9152e4837c5349e4d (reposimplestore !)
+  deleting data/d3/f/index (reposimplestore !)
   deleting meta/d3/00manifest.i (tree !)
   $ hg log -T '{desc}\n' -r .
   add d10/f
@@ -189,7 +200,10 @@
   * (glob)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
-  deleting data/d3/f.i
+  deleting data/d3/f.i (reporevlogstore !)
+  deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
+  deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !)
+  deleting data/d3/f/index (reposimplestore !)
   deleting meta/d3/00manifest.i (tree !)
   $ hg id
   000000000000
@@ -209,7 +223,9 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/d0/f.i
+  deleting data/d0/f.i (reporevlogstore !)
+  deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
+  deleting data/d0/f/index (reposimplestore !)
   deleting meta/d0/00manifest.i (tree !)
   $ hg tracked
   $ hg files
@@ -265,7 +281,9 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/d6/f.i
+  deleting data/d6/f.i (reporevlogstore !)
+  deleting data/d6/f/7339d30678f451ac8c3f38753beeb4cf2e1655c7 (reposimplestore !)
+  deleting data/d6/f/index (reposimplestore !)
   deleting meta/d6/00manifest.i (tree !)
   $ hg tracked
   I path:d0
@@ -285,7 +303,7 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/d3/f.i
+  deleting data/d3/f.i (reporevlogstore !)
   $ hg tracked
   I path:d0
   I path:d3
@@ -303,7 +321,7 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/d0/f.i
+  deleting data/d0/f.i (reporevlogstore !)
   deleting meta/d0/00manifest.i (tree !)
   $ hg tracked
   I path:d3