diff --git a/tests/hghave.py b/tests/hghave.py
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvaGdoYXZlLnB5..d655382584c573fc1021789ed703b24235580742_dGVzdHMvaGdoYXZlLnB5 100644
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -1028,65 +1028,6 @@
     return 'HGTESTEXTRAEXTENSIONS' in os.environ
 
 
-def getrepofeatures():
-    """Obtain set of repository features in use.
-
-    HGREPOFEATURES can be used to define or remove features. It contains
-    a space-delimited list of feature strings. Strings beginning with ``-``
-    mean to remove.
-    """
-    # Default list provided by core.
-    features = {
-        'bundlerepo',
-        'revlogstore',
-        'fncache',
-    }
-
-    # Features that imply other features.
-    implies = {
-        'simplestore': ['-revlogstore', '-bundlerepo', '-fncache'],
-    }
-
-    for override in os.environ.get('HGREPOFEATURES', '').split(' '):
-        if not override:
-            continue
-
-        if override.startswith('-'):
-            if override[1:] in features:
-                features.remove(override[1:])
-        else:
-            features.add(override)
-
-            for imply in implies.get(override, []):
-                if imply.startswith('-'):
-                    if imply[1:] in features:
-                        features.remove(imply[1:])
-                else:
-                    features.add(imply)
-
-    return features
-
-
-@check('reporevlogstore', 'repository using the default revlog store')
-def has_reporevlogstore():
-    return 'revlogstore' in getrepofeatures()
-
-
-@check('reposimplestore', 'repository using simple storage extension')
-def has_reposimplestore():
-    return 'simplestore' in getrepofeatures()
-
-
-@check('repobundlerepo', 'whether we can open bundle files as repos')
-def has_repobundlerepo():
-    return 'bundlerepo' in getrepofeatures()
-
-
-@check('repofncache', 'repository has an fncache')
-def has_repofncache():
-    return 'fncache' in getrepofeatures()
-
-
 @check('dirstate-v2', 'using the v2 format of .hg/dirstate')
 def has_dirstate_v2():
     # Keep this logic in sync with `newreporequirements()` in `mercurial/localrepo.py`
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1hdWRpdC1wYXRoLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1hdWRpdC1wYXRoLnQ= 100644
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -1,6 +1,5 @@
 The simple store doesn't escape paths robustly and can't store paths
 with periods, etc. So much of this test fails with it.
-#require no-reposimplestore
 
   $ hg init repo
   $ cd repo
diff --git a/tests/test-bundle.t b/tests/test-bundle.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1idW5kbGUudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1idW5kbGUudA== 100644
--- a/tests/test-bundle.t
+++ b/tests/test-bundle.t
@@ -67,8 +67,6 @@
   [1]
   $ hg -R empty verify -q
 
-#if repobundlerepo
-
 Pull full.hg into test (using --cwd)
 
   $ hg --cwd test pull ../full.hg
@@ -271,8 +269,6 @@
   
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
-#endif
-
 Cannot produce streaming clone bundles with "hg bundle"
 
   $ hg -R test bundle -t packed1 packed.hg
@@ -283,7 +279,7 @@
 packed1 is produced properly
 
 
-#if reporevlogstore rust
+#if rust
 
   $ hg -R test debugcreatestreamclonebundle packed.hg
   writing 2665 bytes for 6 files (no-rust !)
@@ -303,7 +299,7 @@
   none-packed1;requirements%3Dgeneraldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog
 #endif
 
-#if reporevlogstore no-rust zstd
+#if no-rust zstd
 
   $ hg -R test debugcreatestreamclonebundle packed.hg
   writing 2665 bytes for 7 files
@@ -319,7 +315,7 @@
   none-packed1;requirements%3Dgeneraldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog
 #endif
 
-#if reporevlogstore no-rust no-zstd
+#if no-rust no-zstd
 
   $ hg -R test debugcreatestreamclonebundle packed.hg
   writing 2664 bytes for 7 files
@@ -335,8 +331,6 @@
   none-packed1;requirements%3Dgeneraldelta%2Crevlogv1%2Csparserevlog
 #endif
 
-#if reporevlogstore
-
 generaldelta requirement is not listed in stream clone bundles unless used
 
   $ hg --config format.usegeneraldelta=false init testnongd
@@ -345,9 +339,7 @@
   $ hg -q commit -A -m initial
   $ cd ..
 
-#endif
-
-#if reporevlogstore rust
+#if rust
 
   $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
   writing 301 bytes for 3 files (no-rust !)
@@ -369,7 +361,7 @@
 
 #endif
 
-#if reporevlogstore no-rust zstd
+#if no-rust zstd
 
   $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
   writing 301 bytes for 4 files
@@ -388,7 +380,7 @@
 
 #endif
 
-#if reporevlogstore no-rust no-zstd
+#if no-rust no-zstd
 
   $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
   writing 301 bytes for 4 files
@@ -407,8 +399,6 @@
 
 #endif
 
-#if reporevlogstore
-
 Warning emitted when packed bundles contain secret changesets
 
   $ hg init testsecret
@@ -418,9 +408,7 @@
   $ hg phase --force --secret -r .
   $ cd ..
 
-#endif
-
-#if reporevlogstore rust
+#if rust
 
   $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
   (warning: stream clone bundle will contain secret revisions)
@@ -430,7 +418,7 @@
 
 #endif
 
-#if reporevlogstore no-rust zstd
+#if no-rust zstd
 
   $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
   (warning: stream clone bundle will contain secret revisions)
@@ -439,7 +427,7 @@
 
 #endif
 
-#if reporevlogstore no-rust no-zstd
+#if no-rust no-zstd
 
   $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
   (warning: stream clone bundle will contain secret revisions)
@@ -448,8 +436,6 @@
 
 #endif
 
-#if reporevlogstore
-
 Unpacking packed1 bundles with "hg unbundle" isn't allowed
 
   $ hg init packed
@@ -513,8 +499,6 @@
   abort: cannot apply stream clone bundle on non-empty repo
   [255]
 
-#endif
-
 Create partial clones
 
   $ rm -r empty
@@ -532,8 +516,6 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd partial
 
-#if repobundlerepo
-
 Log -R full.hg in partial
 
   $ hg -R bundle://../full.hg log -T phases
@@ -669,8 +651,6 @@
   abort: *../does-not-exist.hg* (glob)
   [255]
 
-#endif
-
   $ cd ..
 
 hide outer repo
@@ -678,8 +658,6 @@
 
 Direct clone from bundle (all-history)
 
-#if repobundlerepo
-
   $ hg clone full.hg full-clone
   requesting all changes
   adding changesets
@@ -761,8 +739,6 @@
   
   $ cd ..
 
-#endif
-
 test for 540d1059c802
 
   $ hg init orig
@@ -785,7 +761,6 @@
 
   $ cd ..
 
-#if repobundlerepo
   $ cd orig
   $ hg incoming ../bundle.hg
   comparing with ../bundle.hg
@@ -815,8 +790,6 @@
   [255]
   $ cd ..
 
-#endif
-
 test to bundle revisions on the newly created branch (issue3828):
 
   $ hg -q clone -U test test-clone
@@ -827,6 +800,5 @@
   $ hg -q outgoing ../test-clone
   9:b4f5acb1ee27
   $ hg -q bundle --branch foo foo.hg ../test-clone
-#if repobundlerepo
   $ hg -R foo.hg -q log -r "bundle()"
   9:b4f5acb1ee27
@@ -831,6 +803,5 @@
   $ hg -R foo.hg -q log -r "bundle()"
   9:b4f5acb1ee27
-#endif
 
   $ cd ..
 
@@ -846,7 +817,6 @@
 
 full history bundle, refuses to verify non-local repo
 
-#if repobundlerepo
   $ hg -R all.hg verify
   abort: cannot verify bundle or remote repos
   [255]
@@ -850,9 +820,8 @@
   $ hg -R all.hg verify
   abort: cannot verify bundle or remote repos
   [255]
-#endif
 
 but, regular verify must continue to work
 
   $ hg -R orig verify -q
 
@@ -854,9 +823,8 @@
 
 but, regular verify must continue to work
 
   $ hg -R orig verify -q
 
-#if repobundlerepo
 diff against bundle
 
   $ hg init b
@@ -871,7 +839,6 @@
   -2
   -3
   $ cd ..
-#endif
 
 bundle single branch
 
@@ -930,9 +897,8 @@
   files: x 3/3 files (100.00%)
   bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
 
-#if repobundlerepo
 == Test for issue3441
 
   $ hg clone -q -r0 . part2
   $ hg -q -R part2 pull bundle.hg
   $ hg -R part2 verify -q
@@ -934,9 +900,8 @@
 == Test for issue3441
 
   $ hg clone -q -r0 . part2
   $ hg -q -R part2 pull bundle.hg
   $ hg -R part2 verify -q
-#endif
 
 == Test bundling no commits
 
@@ -996,8 +961,6 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     0
   
-
-#if repobundlerepo
   $ hg bundle --base 1 -r 3 ../update2bundled.hg
   1 changesets found
   $ hg strip -r 3
@@ -1019,7 +982,6 @@
 
   $ hg update -R ../update2bundled.hg -r 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-#endif
 
 Test the option that create slim bundle
 
diff --git a/tests/test-censor.t b/tests/test-censor.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jZW5zb3IudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jZW5zb3IudA== 100644
--- a/tests/test-censor.t
+++ b/tests/test-censor.t
@@ -1,4 +1,3 @@
-#require no-reposimplestore
 #testcases revlogv1 revlogv2
 
 #if revlogv2
diff --git a/tests/test-clone-stream-format.t b/tests/test-clone-stream-format.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0tZm9ybWF0LnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0tZm9ybWF0LnQ= 100644
--- a/tests/test-clone-stream-format.t
+++ b/tests/test-clone-stream-format.t
@@ -1,6 +1,6 @@
 This file contains tests case that deal with format change accross stream clone
 
-#require serve no-reposimplestore no-chg
+#require serve no-chg
 
 #testcases stream-legacy stream-bundle2
 
diff --git a/tests/test-clone-stream.t b/tests/test-clone-stream.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0udA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jbG9uZS1zdHJlYW0udA== 100644
--- a/tests/test-clone-stream.t
+++ b/tests/test-clone-stream.t
@@ -1,4 +1,4 @@
-#require serve no-reposimplestore no-chg
+#require serve no-chg
 
 #testcases stream-legacy stream-bundle2-v2 stream-bundle2-v3
 
diff --git a/tests/test-clone.t b/tests/test-clone.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jbG9uZS50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jbG9uZS50 100644
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -18,10 +18,9 @@
 
 List files in store/data (should show a 'b.d'):
 
-#if reporevlogstore
   $ for i in .hg/store/data/*; do
   >   echo $i
   > done
   .hg/store/data/a.i
   .hg/store/data/b.d
   .hg/store/data/b.i
@@ -22,10 +21,9 @@
   $ for i in .hg/store/data/*; do
   >   echo $i
   > done
   .hg/store/data/a.i
   .hg/store/data/b.d
   .hg/store/data/b.i
-#endif
 
 Trigger branchcache creation:
 
diff --git a/tests/test-clonebundles-autogen.t b/tests/test-clonebundles-autogen.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jbG9uZWJ1bmRsZXMtYXV0b2dlbi50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jbG9uZWJ1bmRsZXMtYXV0b2dlbi50 100644
--- a/tests/test-clonebundles-autogen.t
+++ b/tests/test-clonebundles-autogen.t
@@ -1,5 +1,5 @@
 
-#require no-reposimplestore no-chg
+#require no-chg
 
 initial setup
 
diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jbG9uZWJ1bmRsZXMudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jbG9uZWJ1bmRsZXMudA== 100644
--- a/tests/test-clonebundles.t
+++ b/tests/test-clonebundles.t
@@ -1,4 +1,4 @@
-#require no-reposimplestore no-chg
+#require no-chg
 
 Set up a server
 
diff --git a/tests/test-contrib-dumprevlog.t b/tests/test-contrib-dumprevlog.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jb250cmliLWR1bXByZXZsb2cudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jb250cmliLWR1bXByZXZsb2cudA== 100644
--- a/tests/test-contrib-dumprevlog.t
+++ b/tests/test-contrib-dumprevlog.t
@@ -1,5 +1,3 @@
-#require reporevlogstore
-
   $ CONTRIBDIR="$TESTDIR/../contrib"
 
   $ hg init repo-a
diff --git a/tests/test-contrib-perf.t b/tests/test-contrib-perf.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jb250cmliLXBlcmYudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jb250cmliLXBlcmYudA== 100644
--- a/tests/test-contrib-perf.t
+++ b/tests/test-contrib-perf.t
@@ -251,7 +251,6 @@
   $ hg perfdirstatedirs
   $ hg perfdirstatefoldmap
   $ hg perfdirstatewrite
-#if repofncache
   $ hg perffncacheencode
   $ hg perffncacheload
   $ hg debugrebuildfncache
@@ -259,7 +258,6 @@
   $ hg perffncachewrite
   $ hg debugrebuildfncache
   fncache already up to date
-#endif
   $ hg perfheads
   $ hg perfignore
   $ hg perfindex
@@ -280,5 +278,4 @@
   $ hg perfprogress --total 1000
   $ hg perfrawfiles 2
   $ hg perfrevlogindex -c
-#if reporevlogstore
   $ hg perfrevlogrevisions .hg/store/data/a.i
@@ -284,5 +281,4 @@
   $ hg perfrevlogrevisions .hg/store/data/a.i
-#endif
 
 #if no-rust
 Cannot test in Rust because this these are highly invasive and expect a certain
diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jb252ZXJ0LWZpbGVtYXAudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jb252ZXJ0LWZpbGVtYXAudA== 100644
--- a/tests/test-convert-filemap.t
+++ b/tests/test-convert-filemap.t
@@ -283,6 +283,5 @@
   > 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
@@ -287,8 +286,3 @@
   $ 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
@@ -294,5 +288,4 @@
   $ hg -q convert --filemap renames.fmap --datesort source dummydest
-  abort: dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !)
-  abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
+  abort: dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found
   [50]
   $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo
@@ -297,9 +290,7 @@
   [50]
   $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo
-  ignoring: dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !)
-  ignoring: dir/file4@6edd55f559cdce67132b12ca09e09cee08b60442: no match found (reporevlogstore !)
-  ignoring: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
-  ignoring: data/dir/file4/index@6edd55f559cd: no node (reposimplestore !)
+  ignoring: dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found
+  ignoring: dir/file4@6edd55f559cdce67132b12ca09e09cee08b60442: no match found
   $ hg up -q -R renames.repo
   $ glog -R renames.repo
   @  4 "8: change foo" files: foo2
diff --git a/tests/test-convert-hg-source.t b/tests/test-convert-hg-source.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jb252ZXJ0LWhnLXNvdXJjZS50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jb252ZXJ0LWhnLXNvdXJjZS50 100644
--- a/tests/test-convert-hg-source.t
+++ b/tests/test-convert-hg-source.t
@@ -169,5 +169,4 @@
 
 break it
 
-#if reporevlogstore
   $ rm .hg/store/data/b.*
@@ -173,8 +172,4 @@
   $ 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
@@ -182,8 +177,7 @@
   sorting...
   converting...
   4 init
-  ignoring: b@1e88685f5ddec574a34c70af492f95b6debc8741: no match found (reporevlogstore !)
-  ignoring: data/b/index@1e88685f5dde: no node (reposimplestore !)
+  ignoring: b@1e88685f5ddec574a34c70af492f95b6debc8741: no match found
   3 changeall
   2 changebagain
   1 merge
diff --git a/tests/test-convert.t b/tests/test-convert.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jb252ZXJ0LnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jb252ZXJ0LnQ= 100644
--- a/tests/test-convert.t
+++ b/tests/test-convert.t
@@ -532,5 +532,4 @@
 
 contents of fncache file:
 
-#if repofncache
   $ cat b/.hg/store/fncache | sort
@@ -536,7 +535,6 @@
   $ cat b/.hg/store/fncache | sort
-  data/a.i (reporevlogstore !)
-  data/b.i (reporevlogstore !)
-#endif
+  data/a.i
+  data/b.i
 
 test bogus URL
 
diff --git a/tests/test-copy.t b/tests/test-copy.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1jb3B5LnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1jb3B5LnQ= 100644
--- a/tests/test-copy.t
+++ b/tests/test-copy.t
@@ -86,6 +86,5 @@
   copy: a
   copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 
-#if reporevlogstore
   $ md5sum.py .hg/store/data/b.i
   44913824c8f5890ae218f9829535922e  .hg/store/data/b.i
@@ -90,6 +89,5 @@
   $ md5sum.py .hg/store/data/b.i
   44913824c8f5890ae218f9829535922e  .hg/store/data/b.i
-#endif
   $ hg cat b > bsum
   $ md5sum.py bsum
   60b725f10c9c85c70d97880dfe8191b3  bsum
diff --git a/tests/test-debugcommands.t b/tests/test-debugcommands.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1kZWJ1Z2NvbW1hbmRzLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1kZWJ1Z2NvbW1hbmRzLnQ= 100644
--- a/tests/test-debugcommands.t
+++ b/tests/test-debugcommands.t
@@ -14,7 +14,6 @@
   $ hg revert --all -r 0
   adding a
   $ hg ci -Am make-it-full
-#if reporevlogstore
   $ hg debugrevlog -c
   format : 1
   flags  : (none)
@@ -125,10 +124,9 @@
   full revision size (min/max/avg)     : 3 / 3 / 3
   inter-snapshot size (min/max/avg)    : 0 / 0 / 0
   delta size (min/max/avg)             : 0 / 0 / 0
-#endif
 
 Test debugindex, with and without the --verbose/--debug flag
   $ hg debugrevlogindex a
      rev linkrev nodeid       p1           p2
        0       0 b789fdd96dc2 000000000000 000000000000
 
@@ -129,10 +127,9 @@
 
 Test debugindex, with and without the --verbose/--debug flag
   $ hg debugrevlogindex a
      rev linkrev nodeid       p1           p2
        0       0 b789fdd96dc2 000000000000 000000000000
 
-#if no-reposimplestore
   $ hg --verbose debugrevlogindex a
      rev    offset  length linkrev nodeid       p1           p2
        0         0       3       0 b789fdd96dc2 000000000000 000000000000
@@ -140,9 +137,8 @@
   $ hg --debug debugrevlogindex a
      rev    offset  length linkrev nodeid                                   p1                                       p2
        0         0       3       0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
-#endif
 
   $ hg debugrevlogindex -f 1 a
      rev flag     size   link     p1     p2       nodeid
        0 0000        2      0     -1     -1 b789fdd96dc2
 
@@ -144,9 +140,8 @@
 
   $ hg debugrevlogindex -f 1 a
      rev flag     size   link     p1     p2       nodeid
        0 0000        2      0     -1     -1 b789fdd96dc2
 
-#if no-reposimplestore
   $ hg --verbose debugrevlogindex -f 1 a
      rev flag   offset   length     size   link     p1     p2       nodeid
        0 0000        0        3        2      0     -1     -1 b789fdd96dc2
@@ -154,7 +149,6 @@
   $ hg --debug debugrevlogindex -f 1 a
      rev flag   offset   length     size   link     p1     p2                                   nodeid
        0 0000        0        3        2      0     -1     -1 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
-#endif
 
   $ hg debugindex -c
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
@@ -185,12 +179,7 @@
 
 debugdelta chain basic output
 
-#if reporevlogstore pure rust
-  $ hg debugindexstats
-  abort: debugindexstats only works with native C code
-  [255]
-#endif
-#if reporevlogstore no-pure no-rust
+#if no-pure no-rust
   $ hg debugindexstats
   node trie capacity: 4
   node trie count: 2
@@ -202,5 +191,9 @@
   node trie misses: 1
   node trie splits: 1
   revs in memory: 3
+#else
+  $ hg debugindexstats
+  abort: debugindexstats only works with native C code
+  [255]
 #endif
 
@@ -205,6 +198,6 @@
 #endif
 
-#if reporevlogstore no-pure
+#if no-pure
   $ hg debugdeltachain -m --all-info
       rev      p1      p2  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio   readsize largestblk rddensity srchunks
         0      -1      -1       1        1       -1    base         44         43         44   1.02326        44         0    0.00000         44         44   1.00000        1
diff --git a/tests/test-flagprocessor.t b/tests/test-flagprocessor.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1mbGFncHJvY2Vzc29yLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1mbGFncHJvY2Vzc29yLnQ= 100644
--- a/tests/test-flagprocessor.t
+++ b/tests/test-flagprocessor.t
@@ -233,7 +233,6 @@
   $ echo '[BASE64]a-bit-longer-branching' > base64
   $ hg commit -q -m branching
 
-#if repobundlerepo
   $ hg bundle --base 1 bundle.hg
   4 changesets found
   $ hg --config extensions.strip= strip -r 2 --no-backup --force -q
@@ -290,7 +289,6 @@
    1 files changed, 1 insertions(+), 0 deletions(-)
   
   $ rm bundle.hg bundle-again.hg
-#endif
 
 # TEST: hg status
 
diff --git a/tests/test-fncache.t b/tests/test-fncache.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1mbmNhY2hlLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1mbmNhY2hlLnQ= 100644
--- a/tests/test-fncache.t
+++ b/tests/test-fncache.t
@@ -1,5 +1,3 @@
-#require repofncache
-
 An extension which will set fncache chunksize to 1 byte to make sure that logic
 does not break
 
@@ -114,7 +112,7 @@
   .hg/wcache/checkisexec (execbit !)
   .hg/wcache/checklink (symlink !)
   .hg/wcache/checklink-target (symlink !)
-  .hg/wcache/manifestfulltextcache (reporevlogstore !)
+  .hg/wcache/manifestfulltextcache
   $ cd ..
 
 Non fncache repo:
@@ -156,7 +154,7 @@
   .hg/wcache/checkisexec (execbit !)
   .hg/wcache/checklink (symlink !)
   .hg/wcache/checklink-target (symlink !)
-  .hg/wcache/manifestfulltextcache (reporevlogstore !)
+  .hg/wcache/manifestfulltextcache
   $ cd ..
 
 Encoding of reserved / long paths in the store
diff --git a/tests/test-generaldelta.t b/tests/test-generaldelta.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1nZW5lcmFsZGVsdGEudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1nZW5lcmFsZGVsdGEudA== 100644
--- a/tests/test-generaldelta.t
+++ b/tests/test-generaldelta.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
 Check whether size of generaldelta revlog is not bigger than its
 regular equivalent. Test would fail if generaldelta was naive
 implementation of parentdelta: third manifest revision would be fully
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1oYXJkbGlua3MudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1oYXJkbGlua3MudA== 100644
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -1,4 +1,4 @@
-#require hardlink reporevlogstore
+#require hardlink
 
   $ cat > nlinks.py <<EOF
   > import sys
@@ -51,8 +51,8 @@
   1 r1/.hg/store/00manifest.i
   1 r1/.hg/store/data/d1/f2.i
   1 r1/.hg/store/data/f1.i
-  1 r1/.hg/store/fncache (repofncache !)
+  1 r1/.hg/store/fncache
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/requires
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.00changelog.n.bck (rust !)
@@ -55,8 +55,8 @@
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/requires
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.00changelog.n.bck (rust !)
-  1 r1/.hg/store/undo.backup.fncache.bck (repofncache !)
+  1 r1/.hg/store/undo.backup.fncache.bck
   1 r1/.hg/store/undo.backupfiles
 
 
@@ -108,8 +108,8 @@
   2 r1/.hg/store/00manifest.i
   2 r1/.hg/store/data/d1/f2.i
   2 r1/.hg/store/data/f1.i
-  1 r1/.hg/store/fncache (repofncache !)
+  1 r1/.hg/store/fncache
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/requires
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.00changelog.n.bck (rust !)
@@ -112,8 +112,8 @@
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/requires
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.00changelog.n.bck (rust !)
-  1 r1/.hg/store/undo.backup.fncache.bck (repofncache !)
+  1 r1/.hg/store/undo.backup.fncache.bck
   1 r1/.hg/store/undo.backupfiles
 
   $ nlinksdir r2/.hg/store
@@ -124,7 +124,7 @@
   2 r2/.hg/store/00manifest.i
   2 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
-  1 r2/.hg/store/fncache (repofncache !)
+  1 r2/.hg/store/fncache
   1 r2/.hg/store/requires
 
 Repo r3 should not be hardlinked:
@@ -137,7 +137,7 @@
   1 r3/.hg/store/00manifest.i
   1 r3/.hg/store/data/d1/f2.i
   1 r3/.hg/store/data/f1.i
-  1 r3/.hg/store/fncache (repofncache !)
+  1 r3/.hg/store/fncache
   1 r3/.hg/store/phaseroots
   1 r3/.hg/store/requires
   1 r3/.hg/store/undo
@@ -166,7 +166,7 @@
   1 r3/.hg/store/data/d1/f2.d
   1 r3/.hg/store/data/d1/f2.i
   1 r3/.hg/store/data/f1.i
-  1 r3/.hg/store/fncache (repofncache !)
+  1 r3/.hg/store/fncache
   1 r3/.hg/store/phaseroots
   1 r3/.hg/store/requires
   1 r3/.hg/store/undo
@@ -196,6 +196,6 @@
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
-  [12] r2/\.hg/store/fncache (re) (repofncache !)
+  [12] r2/\.hg/store/fncache (re)
   1 r2/.hg/store/requires
 
@@ -200,6 +200,6 @@
   1 r2/.hg/store/requires
 
-#if hardlink-whitelisted repofncache
+#if hardlink-whitelisted
   $ nlinksdir r2/.hg/store/fncache
   1 r2/.hg/store/fncache
 #endif
@@ -224,6 +224,6 @@
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   1 r2/.hg/store/data/f1.i
-  1 r2/.hg/store/fncache (repofncache !)
+  1 r2/.hg/store/fncache
   1 r2/.hg/store/requires
 
@@ -228,6 +228,6 @@
   1 r2/.hg/store/requires
 
-#if hardlink-whitelisted repofncache
+#if hardlink-whitelisted
   $ nlinksdir r2/.hg/store/fncache
   1 r2/.hg/store/fncache
 #endif
@@ -282,7 +282,7 @@
   2 r4/.hg/store/data/d1/f2.i
   2 r4/.hg/store/data/f1.i
   2 r4/.hg/store/data/f3.i
-  2 r4/.hg/store/fncache (repofncache !)
+  2 r4/.hg/store/fncache
   2 r4/.hg/store/phaseroots
   2 r4/.hg/store/requires
   2 r4/.hg/store/undo
@@ -294,7 +294,7 @@
   2 r4/.hg/wcache/checkisexec (execbit !)
   2 r4/.hg/wcache/checklink-target (symlink !)
   2 r4/.hg/wcache/checknoexec (execbit !)
-  2 r4/.hg/wcache/manifestfulltextcache (reporevlogstore !)
+  2 r4/.hg/wcache/manifestfulltextcache
   2 r4/d1/data1
   2 r4/d1/f2
   2 r4/f1
@@ -347,7 +347,7 @@
   2 r4/.hg/wcache/checkisexec (execbit !)
   2 r4/.hg/wcache/checklink-target (symlink !)
   2 r4/.hg/wcache/checknoexec (execbit !)
-  1 r4/.hg/wcache/manifestfulltextcache (reporevlogstore !)
+  1 r4/.hg/wcache/manifestfulltextcache
   2 r4/d1/data1
   2 r4/d1/f2
   1 r4/f1
diff --git a/tests/test-hgweb-bundle.t b/tests/test-hgweb-bundle.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1oZ3dlYi1idW5kbGUudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1oZ3dlYi1idW5kbGUudA== 100644
--- a/tests/test-hgweb-bundle.t
+++ b/tests/test-hgweb-bundle.t
@@ -1,4 +1,4 @@
-#require serve repobundlerepo
+#require serve
 
   $ hg init server
   $ cd server
diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1odHRwLWJ1bmRsZTEudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1odHRwLWJ1bmRsZTEudA== 100644
--- a/tests/test-http-bundle1.t
+++ b/tests/test-http-bundle1.t
@@ -35,7 +35,6 @@
 
 clone via stream
 
-#if no-reposimplestore
   $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
   streaming all changes
   * files to transfer, * bytes of data (glob)
@@ -45,7 +44,6 @@
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R copy -q
-#endif
 
 try to clone via stream, should use pull instead
 
@@ -214,7 +212,6 @@
   $ hg id http://user@localhost:$HGPORT2/
   5fed3813f7f5
 
-#if no-reposimplestore
   $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
   streaming all changes
   * files to transfer, * of data (glob)
@@ -223,7 +220,6 @@
   no changes found
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
-#endif
 
 --pull should override server's preferuncompressed
 
@@ -282,16 +278,16 @@
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
-  "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
-  "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
-  "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
-  "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
-  "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
-  "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
-  "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
+  "GET /?cmd=capabilities HTTP/1.1" 401 -
+  "GET /?cmd=capabilities HTTP/1.1" 200 -
+  "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
+  "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
+  "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
+  "GET /?cmd=capabilities HTTP/1.1" 401 -
+  "GET /?cmd=capabilities HTTP/1.1" 200 -
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
@@ -369,7 +365,6 @@
   server has pull-based clones disabled
   [100]
 
-#if no-reposimplestore
 ... but keep stream clones working
 
   $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone
@@ -378,7 +373,6 @@
   stream-cloned * files / * KB in * seconds (* */sec) (glob)
   searching for changes
   no changes found
-#endif
 
 ... and also keep partial clones and pulls working
   $ hg clone http://localhost:$HGPORT1 --rev 0 test-partial-clone
diff --git a/tests/test-http.t b/tests/test-http.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1odHRwLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1odHRwLnQ= 100644
--- a/tests/test-http.t
+++ b/tests/test-http.t
@@ -26,7 +26,6 @@
 
 clone via stream
 
-#if no-reposimplestore
   $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
   streaming all changes
   * files to transfer, * bytes of data (glob)
@@ -34,7 +33,6 @@
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R copy -q
-#endif
 
 try to clone via stream, should use pull instead
 
@@ -250,10 +248,9 @@
   $ hg id http://localhost:$HGPORT2/ --config extensions.x=use_digests.py
   5fed3813f7f5
 
-#if no-reposimplestore
   $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
   streaming all changes
   * files to transfer, * KB of data (glob)
   stream-cloned * files / * KB in * seconds (*/sec) (glob)
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -254,10 +251,9 @@
   $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
   streaming all changes
   * files to transfer, * KB of data (glob)
   stream-cloned * files / * KB in * seconds (*/sec) (glob)
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
-#endif
 
 --pull should override server's preferuncompressed
   $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
@@ -416,12 +412,12 @@
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
   "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
-  "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
-  "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
-  "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
-  "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=0&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&stream=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
-  "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
-  "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
+  "GET /?cmd=capabilities HTTP/1.1" 401 -
+  "GET /?cmd=capabilities HTTP/1.1" 200 -
+  "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
+  "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=0&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&stream=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
+  "GET /?cmd=capabilities HTTP/1.1" 401 -
+  "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
@@ -510,7 +506,6 @@
   (remove --pull if specified or upgrade Mercurial)
   [100]
 
-#if no-reposimplestore
 ... but keep stream clones working
 
   $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone
@@ -518,7 +513,6 @@
   * files to transfer, * of data (glob)
   stream-cloned * files / * in * seconds (*/sec) (glob)
   $ cat error.log
-#endif
 
 ... and also keep partial clones and pulls working
   $ hg clone http://localhost:$HGPORT1 --rev 0 test/partial/clone
diff --git a/tests/test-inherit-mode.t b/tests/test-inherit-mode.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1pbmhlcml0LW1vZGUudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1pbmhlcml0LW1vZGUudA== 100644
--- a/tests/test-inherit-mode.t
+++ b/tests/test-inherit-mode.t
@@ -85,15 +85,9 @@
   00660 ./.hg/store/00manifest.i
   00770 ./.hg/store/data/
   00770 ./.hg/store/data/dir/
-  00660 ./.hg/store/data/dir/bar.i (reporevlogstore !)
-  00660 ./.hg/store/data/foo.i (reporevlogstore !)
-  00770 ./.hg/store/data/dir/bar/ (reposimplestore !)
-  00660 ./.hg/store/data/dir/bar/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !)
-  00660 ./.hg/store/data/dir/bar/index (reposimplestore !)
-  00770 ./.hg/store/data/foo/ (reposimplestore !)
-  00660 ./.hg/store/data/foo/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !)
-  00660 ./.hg/store/data/foo/index (reposimplestore !)
-  00660 ./.hg/store/fncache (repofncache !)
+  00660 ./.hg/store/data/dir/bar.i
+  00660 ./.hg/store/data/foo.i
+  00660 ./.hg/store/fncache
   00660 ./.hg/store/phaseroots
   00600 ./.hg/store/requires
   00660 ./.hg/store/undo
@@ -104,7 +98,7 @@
   00711 ./.hg/wcache/checkisexec
   007.. ./.hg/wcache/checklink (re)
   00600 ./.hg/wcache/checklink-target
-  00660 ./.hg/wcache/manifestfulltextcache (reporevlogstore !)
+  00660 ./.hg/wcache/manifestfulltextcache
   00700 ./dir/
   00600 ./dir/bar
   00600 ./foo
@@ -147,15 +141,9 @@
   00660 ../push/.hg/store/00manifest.i
   00770 ../push/.hg/store/data/
   00770 ../push/.hg/store/data/dir/
-  00660 ../push/.hg/store/data/dir/bar.i (reporevlogstore !)
-  00660 ../push/.hg/store/data/foo.i (reporevlogstore !)
-  00770 ../push/.hg/store/data/dir/bar/ (reposimplestore !)
-  00660 ../push/.hg/store/data/dir/bar/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !)
-  00660 ../push/.hg/store/data/dir/bar/index (reposimplestore !)
-  00770 ../push/.hg/store/data/foo/ (reposimplestore !)
-  00660 ../push/.hg/store/data/foo/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !)
-  00660 ../push/.hg/store/data/foo/index (reposimplestore !)
-  00660 ../push/.hg/store/fncache (repofncache !)
+  00660 ../push/.hg/store/data/dir/bar.i
+  00660 ../push/.hg/store/data/foo.i
+  00660 ../push/.hg/store/fncache
   00660 ../push/.hg/store/requires
   00660 ../push/.hg/store/undo
   00660 ../push/.hg/store/undo.backupfiles
diff --git a/tests/test-init.t b/tests/test-init.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1pbml0LnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1pbml0LnQ= 100644
--- a/tests/test-init.t
+++ b/tests/test-init.t
@@ -28,7 +28,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
   $ echo this > local/foo
   $ hg ci --cwd local -A -m "init"
   adding foo
@@ -67,7 +66,6 @@
   persistent-nodemap (rust !)
   revlog-compression-zstd (zstd !)
   revlogv1
-  testonly-simplestore (reposimplestore !)
   sparserevlog
 
 creating repo with format.usefncache=false
@@ -84,7 +82,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
 creating repo with format.dotencode=false
 
@@ -101,7 +98,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
 creating repo with format.dotencode=false
 
@@ -117,7 +113,6 @@
   revlogv1
   share-safe
   store
-  testonly-simplestore (reposimplestore !)
 
 test failure
 
@@ -239,7 +234,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
 prepare test of init of url configured from paths
 
@@ -263,7 +257,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
 verify that clone also expand urls
 
@@ -283,7 +276,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
 clone bookmarks
 
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1rZXl3b3JkLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1rZXl3b3JkLnQ= 100644
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
 Run kwdemo outside a repo
   $ hg -q --config extensions.keyword= --config keywordmaps.Foo="{author|user}" kwdemo
   [extensions]
diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLXVwZGF0ZS50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLXVwZGF0ZS50 100644
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
 This file focuses mainly on updating largefiles in the working
 directory (and ".hg/largefiles/dirstate")
 
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1sZmNvbnZlcnQudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1sZmNvbnZlcnQudA== 100644
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -106,7 +106,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
 "lfconvert" includes a newline at the end of the standin files.
   $ cat .hglf/large .hglf/sub/maybelarge.dat
diff --git a/tests/test-lfs-largefiles.t b/tests/test-lfs-largefiles.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1sZnMtbGFyZ2VmaWxlcy50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1sZnMtbGFyZ2VmaWxlcy50 100644
--- a/tests/test-lfs-largefiles.t
+++ b/tests/test-lfs-largefiles.t
@@ -1,4 +1,4 @@
-#require no-reposimplestore no-chg
+#require no-chg
 
 This tests the interaction between the largefiles and lfs extensions, and
 conversion from largefiles -> lfs.
diff --git a/tests/test-lfs-serve-access.t b/tests/test-lfs-serve-access.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1sZnMtc2VydmUtYWNjZXNzLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1sZnMtc2VydmUtYWNjZXNzLnQ= 100644
--- a/tests/test-lfs-serve-access.t
+++ b/tests/test-lfs-serve-access.t
@@ -1,4 +1,4 @@
-#require serve no-reposimplestore no-chg
+#require serve no-chg
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
diff --git a/tests/test-lfs-serve.t b/tests/test-lfs-serve.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1sZnMtc2VydmUudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1sZnMtc2VydmUudA== 100644
--- a/tests/test-lfs-serve.t
+++ b/tests/test-lfs-serve.t
@@ -1,5 +1,5 @@
 #testcases lfsremote-on lfsremote-off
-#require serve no-reposimplestore no-chg
+#require serve no-chg
 
 This test splits `hg serve` with and without using the extension into separate
 tests cases.  The tests are broken down as follows, where "LFS"/"No-LFS"
diff --git a/tests/test-lfs-test-server.t b/tests/test-lfs-test-server.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1sZnMtdGVzdC1zZXJ2ZXIudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1sZnMtdGVzdC1zZXJ2ZXIudA== 100644
--- a/tests/test-lfs-test-server.t
+++ b/tests/test-lfs-test-server.t
@@ -1,4 +1,4 @@
-#require no-reposimplestore no-chg
+#require no-chg
 #testcases git-server hg-server
 
 #if git-server
diff --git a/tests/test-lfs.t b/tests/test-lfs.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1sZnMudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1sZnMudA== 100644
--- a/tests/test-lfs.t
+++ b/tests/test-lfs.t
@@ -1,4 +1,4 @@
-#require no-reposimplestore no-chg
+#require no-chg
 
   $ hg init requirements
   $ cd requirements
diff --git a/tests/test-mq-pull-from-bundle.t b/tests/test-mq-pull-from-bundle.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1tcS1wdWxsLWZyb20tYnVuZGxlLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1tcS1wdWxsLWZyb20tYnVuZGxlLnQ= 100644
--- a/tests/test-mq-pull-from-bundle.t
+++ b/tests/test-mq-pull-from-bundle.t
@@ -1,5 +1,3 @@
-#require repobundlerepo
-
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > mq=
diff --git a/tests/test-narrow-clone-no-ellipsis.t b/tests/test-narrow-clone-no-ellipsis.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1uYXJyb3ctY2xvbmUtbm8tZWxsaXBzaXMudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1uYXJyb3ctY2xvbmUtbm8tZWxsaXBzaXMudA== 100644
--- a/tests/test-narrow-clone-no-ellipsis.t
+++ b/tests/test-narrow-clone-no-ellipsis.t
@@ -33,7 +33,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
   $ hg tracked
   I path:dir/src/f10
diff --git a/tests/test-narrow-clone.t b/tests/test-narrow-clone.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1uYXJyb3ctY2xvbmUudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1uYXJyb3ctY2xvbmUudA== 100644
--- a/tests/test-narrow-clone.t
+++ b/tests/test-narrow-clone.t
@@ -61,7 +61,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
   $ hg tracked
   I path:dir/src/f10
diff --git a/tests/test-narrow-exchange.t b/tests/test-narrow-exchange.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1uYXJyb3ctZXhjaGFuZ2UudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1uYXJyb3ctZXhjaGFuZ2UudA== 100644
--- a/tests/test-narrow-exchange.t
+++ b/tests/test-narrow-exchange.t
@@ -105,8 +105,7 @@
   remote: adding file changes
   remote: transaction abort!
   remote: rollback completed
-  remote: abort: data/inside2/f@4a1aa07735e673e20c00fae80f40dc301ee30616: unknown parent (reporevlogstore !)
-  remote: abort: data/inside2/f/index@4a1aa07735e6: no node (reposimplestore !)
+  remote: abort: data/inside2/f@4a1aa07735e673e20c00fae80f40dc301ee30616: unknown parent
   abort: stream ended unexpectedly (got 0 bytes, expected 4)
   [255]
 
diff --git a/tests/test-narrow-patterns.t b/tests/test-narrow-patterns.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1uYXJyb3ctcGF0dGVybnMudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1uYXJyb3ctcGF0dGVybnMudA== 100644
--- a/tests/test-narrow-patterns.t
+++ b/tests/test-narrow-patterns.t
@@ -190,9 +190,7 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/dir1/dirA/bar.i (reporevlogstore !)
-  deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)
-  deleting data/dir1/dirA/bar/index (reposimplestore !)
+  deleting data/dir1/dirA/bar.i
   deleting unwanted files from working copy
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
@@ -247,9 +245,7 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/dir1/dirA/foo.i (reporevlogstore !)
-  deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)
-  deleting data/dir1/dirA/foo/index (reposimplestore !)
+  deleting data/dir1/dirA/foo.i
   deleting unwanted files from working copy
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
diff --git a/tests/test-narrow-shallow-merges.t b/tests/test-narrow-shallow-merges.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1uYXJyb3ctc2hhbGxvdy1tZXJnZXMudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1uYXJyb3ctc2hhbGxvdy1tZXJnZXMudA== 100644
--- a/tests/test-narrow-shallow-merges.t
+++ b/tests/test-narrow-shallow-merges.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
   $ . "$TESTDIR/narrow-library.sh"
 
 create full repo
diff --git a/tests/test-narrow-shallow.t b/tests/test-narrow-shallow.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1uYXJyb3ctc2hhbGxvdy50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1uYXJyb3ctc2hhbGxvdy50 100644
--- a/tests/test-narrow-shallow.t
+++ b/tests/test-narrow-shallow.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
   $ . "$TESTDIR/narrow-library.sh"
 
   $ hg init master
diff --git a/tests/test-narrow-strip.t b/tests/test-narrow-strip.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1uYXJyb3ctc3RyaXAudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1uYXJyb3ctc3RyaXAudA== 100644
--- a/tests/test-narrow-strip.t
+++ b/tests/test-narrow-strip.t
@@ -124,7 +124,6 @@
   $ hg strip .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
-#if repobundlerepo
   $ hg pull .hg/strip-backup/*-backup.hg
   pulling from .hg/strip-backup/*-backup.hg (glob)
   searching for changes
@@ -171,4 +170,3 @@
   added 3 changesets with 2 changes to 1 files (+1 heads)
   new changesets *:* (glob)
   (run 'hg heads' to see heads, 'hg merge' to merge)
-#endif
diff --git a/tests/test-narrow.t b/tests/test-narrow.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1uYXJyb3cudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1uYXJyb3cudA== 100644
--- a/tests/test-narrow.t
+++ b/tests/test-narrow.t
@@ -145,5 +145,5 @@
   * (glob)
   moving unwanted changesets to backup
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
-  deleting data/d0/f.i (reporevlogstore !)
+  deleting data/d0/f.i
   deleting meta/d0/00manifest.i (tree !)
@@ -149,7 +149,4 @@
   deleting meta/d0/00manifest.i (tree !)
-  deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
-  deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
-  deleting data/d0/f/index (reposimplestore !)
   deleting unwanted files from working copy
 
   $ hg log -T "{rev}: {desc} {outsidenarrow}\n"
@@ -179,5 +176,5 @@
   looking for local changes to affected paths
   moving unwanted changesets to backup
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
-  deleting data/d0/f.i (reporevlogstore !)
+  deleting data/d0/f.i
   deleting meta/d0/00manifest.i (tree !)
@@ -183,7 +180,4 @@
   deleting meta/d0/00manifest.i (tree !)
-  deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
-  deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
-  deleting data/d0/f/index (reposimplestore !)
   deleting unwanted files from working copy
 
 Updates off of stripped commit if necessary
@@ -200,5 +194,5 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   moving unwanted changesets to backup
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
-  deleting data/d3/f.i (reporevlogstore !)
+  deleting data/d3/f.i
   deleting meta/d3/00manifest.i (tree !)
@@ -204,7 +198,4 @@
   deleting meta/d3/00manifest.i (tree !)
-  deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
-  deleting data/d3/f/99fa7136105a15e2045ce3d9152e4837c5349e4d (reposimplestore !)
-  deleting data/d3/f/index (reposimplestore !)
   deleting unwanted files from working copy
   $ hg log -T '{desc}\n' -r .
   add d10/f
@@ -225,5 +216,5 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   moving unwanted changesets to backup
   saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
-  deleting data/d3/f.i (reporevlogstore !)
+  deleting data/d3/f.i
   deleting meta/d3/00manifest.i (tree !)
@@ -229,7 +220,4 @@
   deleting meta/d3/00manifest.i (tree !)
-  deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
-  deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !)
-  deleting data/d3/f/index (reposimplestore !)
   deleting unwanted files from working copy
   $ hg id
   000000000000
@@ -287,5 +275,5 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/d0/f.i (reporevlogstore !)
+  deleting data/d0/f.i
   deleting meta/d0/00manifest.i (tree !)
@@ -291,6 +279,4 @@
   deleting meta/d0/00manifest.i (tree !)
-  deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
-  deleting data/d0/f/index (reposimplestore !)
   deleting unwanted files from working copy
   $ hg tracked
   $ hg files
@@ -348,5 +334,5 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/d6/f.i (reporevlogstore !)
+  deleting data/d6/f.i
   deleting meta/d6/00manifest.i (tree !)
@@ -352,8 +338,6 @@
   deleting meta/d6/00manifest.i (tree !)
-  deleting data/d6/f/7339d30678f451ac8c3f38753beeb4cf2e1655c7 (reposimplestore !)
-  deleting data/d6/f/index (reposimplestore !)
   deleting unwanted files from working copy
   $ hg tracked
   I path:d0
   I path:d3
   I path:d9
@@ -355,8 +339,7 @@
   deleting unwanted files from working copy
   $ hg tracked
   I path:d0
   I path:d3
   I path:d9
-#if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
@@ -361,6 +344,5 @@
   $ hg debugrebuildfncache
   fncache already up to date
-#endif
   $ find *
   d0
   d0/f
@@ -373,12 +355,10 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/d3/f.i (reporevlogstore !)
-  deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
-  deleting data/d3/f/index (reposimplestore !)
+  deleting data/d3/f.i
   deleting unwanted files from working copy
   $ hg tracked
   I path:d0
   I path:d3
   I path:d9
   X path:d3/f
@@ -379,9 +359,8 @@
   deleting unwanted files from working copy
   $ hg tracked
   I path:d0
   I path:d3
   I path:d9
   X path:d3/f
-#if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
@@ -386,6 +365,5 @@
   $ hg debugrebuildfncache
   fncache already up to date
-#endif
   $ find *
   d0
   d0/f
@@ -396,5 +374,5 @@
   comparing with ssh://user@dummy/master
   searching for changes
   looking for local changes to affected paths
-  deleting data/d0/f.i (reporevlogstore !)
+  deleting data/d0/f.i
   deleting meta/d0/00manifest.i (tree !)
@@ -400,9 +378,7 @@
   deleting meta/d0/00manifest.i (tree !)
-  deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
-  deleting data/d0/f/index (reposimplestore !)
   deleting unwanted files from working copy
   $ hg tracked
   I path:d3
   I path:d9
   X path:d0
   X path:d3/f
@@ -403,9 +379,8 @@
   deleting unwanted files from working copy
   $ hg tracked
   I path:d3
   I path:d9
   X path:d0
   X path:d3/f
-#if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
@@ -410,6 +385,5 @@
   $ hg debugrebuildfncache
   fncache already up to date
-#endif
   $ find *
   d9
   d9/f
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1vYnNvbGV0ZS50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1vYnNvbGV0ZS50 100644
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -1406,7 +1406,6 @@
   o  0:4b34ecfb0d56 (draft) [ ] A
   
 
-#if repobundlerepo
   $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg
   comparing with ../repo-bundleoverlay
   searching for changes
@@ -1419,7 +1418,6 @@
   |/
   o  0:4b34ecfb0d56 (draft) [ ] A
   
-#endif
 
 #if serve
 
@@ -1606,8 +1604,7 @@
   phase-heads -- {} (mandatory: True)
       e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft
 
-#if repobundlerepo
   $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
   pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
   searching for changes
   no changes found
@@ -1610,8 +1607,7 @@
   $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
   pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
   searching for changes
   no changes found
-#endif
   $ hg debugobsolete
   e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
   $ hg log -G
diff --git a/tests/test-permissions.t b/tests/test-permissions.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1wZXJtaXNzaW9ucy50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1wZXJtaXNzaW9ucy50 100644
--- a/tests/test-permissions.t
+++ b/tests/test-permissions.t
@@ -1,4 +1,4 @@
-#require unix-permissions no-root reporevlogstore
+#require unix-permissions no-root
 
 #testcases dirstate-v1 dirstate-v2
 
diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1waGFzZXMtZXhjaGFuZ2UudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1waGFzZXMtZXhjaGFuZ2UudA== 100644
--- a/tests/test-phases-exchange.t
+++ b/tests/test-phases-exchange.t
@@ -548,7 +548,6 @@
 
 Pulling from bundle does not alter phases of changeset not present in the bundle
 
-#if repobundlerepo
   $ hg bundle  --base 1 -r 6 -r 3 ../partial-bundle.hg
   5 changesets found
   $ hg pull ../partial-bundle.hg
@@ -578,7 +577,6 @@
   |
   o  0 public a-A - 054250a37db4
   
-#endif
 
 Pushing to Publish=False (unknown changeset)
 
diff --git a/tests/test-push.t b/tests/test-push.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1wdXNoLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1wdXNoLnQ= 100644
--- a/tests/test-push.t
+++ b/tests/test-push.t
@@ -123,7 +123,6 @@
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-#if reporevlogstore
 
 Test spurious filelog entries:
 
@@ -190,8 +189,6 @@
 
   $ cd ..
 
-#endif
-
 Test push hook locking
 =====================
 
diff --git a/tests/test-relink.t b/tests/test-relink.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1yZWxpbmsudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1yZWxpbmsudA== 100644
--- a/tests/test-relink.t
+++ b/tests/test-relink.t
@@ -75,8 +75,6 @@
 
 relink
 
-#if no-reposimplestore
-
   $ hg relink --debug --config progress.debug=true | fix_path
   relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store
   tip has 2 files, estimated total number of files: 3
@@ -106,5 +104,3 @@
   repo/.hg/store/data/a.i == clone/.hg/store/data/a.i
   $ "$PYTHON" arelinked.py repo/.hg/store/data/b.i clone/.hg/store/data/b.i
   repo/.hg/store/data/b.i != clone/.hg/store/data/b.i
-
-#endif
diff --git a/tests/test-repair-strip.t b/tests/test-repair-strip.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1yZXBhaXItc3RyaXAudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1yZXBhaXItc3RyaXAudA== 100644
--- a/tests/test-repair-strip.t
+++ b/tests/test-repair-strip.t
@@ -1,4 +1,4 @@
-#require unix-permissions no-root reporevlogstore
+#require unix-permissions no-root
 
   $ cat > $TESTTMP/dumpjournal.py <<EOF
   > import sys
diff --git a/tests/test-revlog-v2.t b/tests/test-revlog-v2.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1yZXZsb2ctdjIudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1yZXZsb2ctdjIudA== 100644
--- a/tests/test-revlog-v2.t
+++ b/tests/test-revlog-v2.t
@@ -1,5 +1,3 @@
-#require reporevlogstore
-
 A repo with unknown revlogv2 requirement string cannot be opened
 
   $ hg init invalidreq
diff --git a/tests/test-share.t b/tests/test-share.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zaGFyZS50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zaGFyZS50 100644
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -49,7 +49,7 @@
   checkisexec (execbit !)
   checklink (symlink no-rust !)
   checklink-target (symlink no-rust !)
-  manifestfulltextcache (reporevlogstore !)
+  manifestfulltextcache
   $ ls -1 ../repo1/.hg/cache
   branch2-served
   rbc-names-v2
diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zaGVsdmUyLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zaGVsdmUyLnQ= 100644
--- a/tests/test-shelve2.t
+++ b/tests/test-shelve2.t
@@ -207,8 +207,7 @@
   $ hg shelve
   shelved as default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-#if repobundlerepo
   $ hg log -G --template '{rev}  {desc|firstline}  {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()' --hidden
   o  [48]  changes to: commit stuff  shelve@localhost (re)
   |
   ~
@@ -211,8 +210,7 @@
   $ hg log -G --template '{rev}  {desc|firstline}  {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()' --hidden
   o  [48]  changes to: commit stuff  shelve@localhost (re)
   |
   ~
-#endif
   $ hg log -G --template '{rev}  {desc|firstline}  {author}'
   @  [37]  commit stuff  test (re)
   |
diff --git a/tests/test-sparse-requirement.t b/tests/test-sparse-requirement.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zcGFyc2UtcmVxdWlyZW1lbnQudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zcGFyc2UtcmVxdWlyZW1lbnQudA== 100644
--- a/tests/test-sparse-requirement.t
+++ b/tests/test-sparse-requirement.t
@@ -27,7 +27,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
   $ hg debugsparse --config extensions.sparse= --enable-profile frontend.sparse
   $ ls -A
@@ -49,7 +48,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
 Client without sparse enabled reacts properly
 
@@ -72,7 +70,6 @@
   share-safe
   sparserevlog
   store
-  testonly-simplestore (reposimplestore !)
 
 And client without sparse can access
 
diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zc2gtYnVuZGxlMS50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zc2gtYnVuZGxlMS50 100644
--- a/tests/test-ssh-bundle1.t
+++ b/tests/test-ssh-bundle1.t
@@ -58,8 +58,6 @@
 
 clone remote via stream
 
-#if no-reposimplestore
-
   $ hg clone --stream ssh://user@dummy/remote local-stream
   streaming all changes
   * files to transfer, * bytes of data (glob)
@@ -91,8 +89,6 @@
   $ cd $TESTTMP
   $ rm -rf local-stream stream2
 
-#endif
-
 clone remote via pull
 
   $ hg clone ssh://user@dummy/remote local
@@ -475,9 +471,9 @@
   Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio (no-msys !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
-  Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !)
-  Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
-  Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
+  Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio
+  Got arguments 1:user@dummy 2:hg -R remote serve --stdio
+  Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R local serve --stdio
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zc2gudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zc2gudA== 100644
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -50,8 +50,6 @@
 
 clone remote via stream
 
-#if no-reposimplestore
-
   $ hg clone --stream ssh://user@dummy/remote local-stream
   streaming all changes
   * files to transfer, * bytes of data (glob)
@@ -79,8 +77,6 @@
   $ cd $TESTTMP
   $ rm -rf local-stream stream2
 
-#endif
-
 clone remote via pull
 
   $ hg clone ssh://user@dummy/remote local
@@ -551,9 +547,9 @@
   Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R $TESTTMP/nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
-  Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !)
-  Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
-  Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
+  Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio
+  Got arguments 1:user@dummy 2:hg -R remote serve --stdio
+  Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R local serve --stdio
diff --git a/tests/test-static-http.t b/tests/test-static-http.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zdGF0aWMtaHR0cC50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zdGF0aWMtaHR0cC50 100644
--- a/tests/test-static-http.t
+++ b/tests/test-static-http.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
   $ hg clone http://localhost:$HGPORT/ copy
   abort: * (glob)
   [100]
diff --git a/tests/test-stream-bundle-v2.t b/tests/test-stream-bundle-v2.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zdHJlYW0tYnVuZGxlLXYyLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zdHJlYW0tYnVuZGxlLXYyLnQ= 100644
--- a/tests/test-stream-bundle-v2.t
+++ b/tests/test-stream-bundle-v2.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
 #testcases stream-v2 stream-v3
 #testcases threaded sequential
 
diff --git a/tests/test-strip.t b/tests/test-strip.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zdHJpcC50..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zdHJpcC50 100644
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -492,7 +492,6 @@
 
   $ touch a
   $ hg ci -qAm a
-#if repofncache
   $ cat .hg/store/fncache | sort
   data/a.i
   data/bar.i
@@ -496,8 +495,7 @@
   $ cat .hg/store/fncache | sort
   data/a.i
   data/bar.i
-#endif
 
   $ hg strip tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
@@ -500,7 +498,6 @@
 
   $ hg strip tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
-#if repofncache
   $ cat .hg/store/fncache
   data/bar.i
@@ -505,6 +502,5 @@
   $ cat .hg/store/fncache
   data/bar.i
-#endif
 
 stripping an empty revset
 
@@ -799,10 +795,9 @@
   saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg
   $ ls .hg/strip-backup
   3903775176ed-e68910bd-backup.hg
-#if repobundlerepo
   $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
   $ hg strip -r 0
   saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg
   $ ls .hg/strip-backup
   3903775176ed-54390173-backup.hg
   3903775176ed-e68910bd-backup.hg
@@ -803,10 +798,9 @@
   $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
   $ hg strip -r 0
   saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg
   $ ls .hg/strip-backup
   3903775176ed-54390173-backup.hg
   3903775176ed-e68910bd-backup.hg
-#endif
   $ cd ..
 
 Test that we only bundle the stripped changesets (issue4736)
@@ -872,7 +866,6 @@
 
   $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg
   2 changesets found
-#if repobundlerepo
   $ hg log -r 'bundle()' -R ../issue4736.hg
   changeset:   3:6625a5168474
   parent:      1:eca11cf91c71
@@ -888,7 +881,6 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     mergeCD
   
-#endif
 
 check strip behavior
 
@@ -934,7 +926,6 @@
 
 strip backup content
 
-#if repobundlerepo
   $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg
   changeset:   3:6625a5168474
   parent:      1:eca11cf91c71
@@ -951,8 +942,6 @@
   summary:     mergeCD
   
 
-#endif
-
 Check that the phase cache is properly invalidated after a strip with bookmark.
 
   $ cat > ../stripstalephasecache.py << EOF
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC1zdWJyZXBvLnQ=..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC1zdWJyZXBvLnQ= 100644
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -1258,7 +1258,7 @@
   ../shared/subrepo-2/.hg/wcache/checkisexec (execbit !)
   ../shared/subrepo-2/.hg/wcache/checklink (symlink no-rust !)
   ../shared/subrepo-2/.hg/wcache/checklink-target (symlink no-rust !)
-  ../shared/subrepo-2/.hg/wcache/manifestfulltextcache (reporevlogstore !)
+  ../shared/subrepo-2/.hg/wcache/manifestfulltextcache
   ../shared/subrepo-2/file
   $ hg -R ../shared in
   abort: repository default not found
diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC10cmVlbWFuaWZlc3QudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC10cmVlbWFuaWZlc3QudA== 100644
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -322,7 +322,6 @@
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
 
-#if repobundlerepo
   $ hg incoming .hg/strip-backup/*
   comparing with .hg/strip-backup/*-backup.hg (glob)
   searching for changes
@@ -332,7 +331,6 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify dir1/a
   
-#endif
 
   $ hg unbundle .hg/strip-backup/*
   adding changesets
@@ -464,5 +462,4 @@
 
 Test files for a subdirectory.
 
-#if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
@@ -468,8 +465,4 @@
   $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
   $ hg files -r . b
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
@@ -485,5 +478,4 @@
 
 Test files with just includes and excludes.
 
-#if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
@@ -489,8 +481,4 @@
   $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
   $ rm -r .hg/store/meta/b/bar/orange/fly
   $ rm -r .hg/store/meta/b/foo/apple/bees
   $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
@@ -502,5 +490,4 @@
 
 Test files for a subdirectory, excluding a directory within it.
 
-#if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
@@ -506,8 +493,4 @@
   $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
   $ rm -r .hg/store/meta/b/foo
   $ hg files -r . -X path:b/foo b
   b/bar/fruits.txt
@@ -523,5 +506,4 @@
 Test files for a sub directory, including only a directory within it, and
 including an unrelated directory.
 
-#if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
@@ -527,8 +509,4 @@
   $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
   $ rm -r .hg/store/meta/b/foo
   $ hg files -r . -I path:b/bar/orange -I path:a b
   b/bar/orange/fly/gnat.py
@@ -542,5 +520,4 @@
 Test files for a pattern, including a directory, and excluding a directory
 within that.
 
-#if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
@@ -546,8 +523,4 @@
   $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
   $ rm -r .hg/store/meta/b/foo
   $ rm -r .hg/store/meta/b/bar/orange
   $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
@@ -566,7 +539,6 @@
 Verify works
   $ hg verify -q
 
-#if repofncache
 Dirlogs are included in fncache
   $ grep meta/.A/00manifest.i .hg/store/fncache
   meta/.A/00manifest.i
@@ -591,7 +563,6 @@
   adding meta/b/foo/apple/00manifest.i
   adding meta/b/foo/apple/bees/00manifest.i
   16 items added, 0 removed from fncache
-#endif
 
 Finish first server
   $ killdaemons.py
@@ -610,12 +581,12 @@
    b/@1: parent-directory manifest refers to unknown revision f065da70369e
    b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
    b/@3: parent-directory manifest refers to unknown revision 367152e6af28
-  warning: orphan data file 'meta/b/bar/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/bar/orange/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/bar/orange/fly/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/foo/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/foo/apple/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/foo/apple/bees/00manifest.i' (reporevlogstore !)
+  warning: orphan data file 'meta/b/bar/00manifest.i'
+  warning: orphan data file 'meta/b/bar/orange/00manifest.i'
+  warning: orphan data file 'meta/b/bar/orange/fly/00manifest.i'
+  warning: orphan data file 'meta/b/foo/00manifest.i'
+  warning: orphan data file 'meta/b/foo/apple/00manifest.i'
+  warning: orphan data file 'meta/b/foo/apple/bees/00manifest.i'
   crosschecking files in changesets and manifests
    b/bar/fruits.txt@0: in changeset but not in manifest
    b/bar/orange/fly/gnat.py@0: in changeset but not in manifest
@@ -624,7 +595,7 @@
   checking files
   not checking dirstate because of previous errors
   checked 4 changesets with 18 changes to 8 files
-  6 warnings encountered! (reporevlogstore !)
+  6 warnings encountered!
   9 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
@@ -684,8 +655,6 @@
 Tree manifest revlogs exist.
   $ find deepclone/.hg/store/meta | sort
   deepclone/.hg/store/meta
-  deepclone/.hg/store/meta/._a (reposimplestore !)
-  deepclone/.hg/store/meta/._a/00manifest.i (reposimplestore !)
   deepclone/.hg/store/meta/b
   deepclone/.hg/store/meta/b/00manifest.i
   deepclone/.hg/store/meta/b/bar
@@ -700,10 +669,10 @@
   deepclone/.hg/store/meta/b/foo/apple/00manifest.i
   deepclone/.hg/store/meta/b/foo/apple/bees
   deepclone/.hg/store/meta/b/foo/apple/bees/00manifest.i
-  deepclone/.hg/store/meta/~2e_a (reporevlogstore !)
-  deepclone/.hg/store/meta/~2e_a/00manifest.i (reporevlogstore !)
+  deepclone/.hg/store/meta/~2e_a
+  deepclone/.hg/store/meta/~2e_a/00manifest.i
 Verify passes.
   $ cd deepclone
   $ hg verify -q
   $ cd ..
 
@@ -705,9 +674,8 @@
 Verify passes.
   $ cd deepclone
   $ hg verify -q
   $ cd ..
 
-#if reporevlogstore
 Create clones using old repo formats to use in later tests
   $ hg clone --config format.usestore=False \
   >   --config experimental.changegroup3=True \
@@ -793,8 +761,6 @@
   $ hg debugbundle --spec repo-packed.hg
   none-packed1;requirements%3D(.*%2C)?treemanifest(%2C.*)? (re)
 
-#endif
-
 Bundle with changegroup2 is not supported
 
   $ hg -R deeprepo bundle --all -t v2 deeprepo.bundle
diff --git a/tests/test-unionrepo.t b/tests/test-unionrepo.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC11bmlvbnJlcG8udA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC11bmlvbnJlcG8udA== 100644
--- a/tests/test-unionrepo.t
+++ b/tests/test-unionrepo.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
 Test unionrepo functionality
 
 Create one repository
diff --git a/tests/test-upgrade-repo.t b/tests/test-upgrade-repo.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC11cGdyYWRlLXJlcG8udA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC11cGdyYWRlLXJlcG8udA== 100644
--- a/tests/test-upgrade-repo.t
+++ b/tests/test-upgrade-repo.t
@@ -1,5 +1,3 @@
-#require no-reposimplestore
-
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > share =
diff --git a/tests/test-verify.t b/tests/test-verify.t
index c4392e8bfb9fcf199c5999536547d3a5718be40e_dGVzdHMvdGVzdC12ZXJpZnkudA==..d655382584c573fc1021789ed703b24235580742_dGVzdHMvdGVzdC12ZXJpZnkudA== 100644
--- a/tests/test-verify.t
+++ b/tests/test-verify.t
@@ -1,5 +1,3 @@
-#require reporevlogstore
-
 prepare repo
 
   $ hg init a