diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t
--- a/tests/test-convert-filemap.t
+++ b/tests/test-convert-filemap.t
@@ -283,14 +283,23 @@
   > exclude dir/subdir
   > include dir/subdir/file3
   > EOF
+#if reporevlogstore
   $ rm source/.hg/store/data/dir/file3.i
   $ rm source/.hg/store/data/dir/file4.i
+#endif
+#if reposimplestore
+  $ rm -rf source/.hg/store/data/dir/file3
+  $ rm -rf source/.hg/store/data/dir/file4
+#endif
   $ hg -q convert --filemap renames.fmap --datesort source dummydest
-  abort: data/dir/file3.i@e96dce0bc6a2: no match found!
+  abort: data/dir/file3.i@e96dce0bc6a2: no match found! (reporevlogstore !)
+  abort: data/dir/file3/index@e96dce0bc6a2: no node! (reposimplestore !)
   [255]
   $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo
-  ignoring: data/dir/file3.i@e96dce0bc6a2: no match found
-  ignoring: data/dir/file4.i@6edd55f559cd: no match found
+  ignoring: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !)
+  ignoring: data/dir/file4.i@6edd55f559cd: no match found (reporevlogstore !)
+  ignoring: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
+  ignoring: data/dir/file4/index@6edd55f559cd: no node (reposimplestore !)
   $ hg up -q -R renames.repo
   $ glog -R renames.repo
   @  4 "8: change foo" files: foo2