SERVER-64473 Split up `core` jstest directory

1009 files changed, 4362 insertions, 4362 deletions

diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml
index 04cc8d5fe2e..cca7e08ed84 100644
--- a/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml
@@ -9,50 +9,50 @@
         - jstests/core/txns/**/*.js
 
         # No-op retries are not ignored by top, the profiler, or opcount.
-        - jstests/core/operation_latency_histogram.js
-        - jstests/core/profile2.js
-        - jstests/core/profile3.js
-        - jstests/core/profile_findandmodify.js
-        - jstests/core/top.js
+        - jstests/core/**/operation_latency_histogram.js
+        - jstests/core/**/profile2.js
+        - jstests/core/**/profile3.js
+        - jstests/core/**/profile_findandmodify.js
+        - jstests/core/**/top.js
         - jstests/core/views/views_stats.js
 
         # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-        - jstests/core/crud_api.js
-        - jstests/core/find_and_modify.js
-        - jstests/core/find_and_modify2.js
-        - jstests/core/find_and_modify_server6865.js
-        - jstests/core/project_with_collation.js
+        - jstests/core/**/crud_api.js
+        - jstests/core/**/find_and_modify.js
+        - jstests/core/**/find_and_modify2.js
+        - jstests/core/**/find_and_modify_server6865.js
+        - jstests/core/**/project_with_collation.js
 
         # Stepdown commands during fsync lock will fail.
-        - jstests/core/currentop.js
-        - jstests/core/fsync.js
-        - jstests/core/killop_drop_collection.js
+        - jstests/core/**/currentop.js
+        - jstests/core/**/fsync.js
+        - jstests/core/**/killop_drop_collection.js
 
         # Expect drops/creates to fail or have a certain response:
-        - jstests/core/explain_upsert.js
-        - jstests/core/indexes_multiple_commands.js
+        - jstests/core/**/explain_upsert.js
+        - jstests/core/**/indexes_multiple_commands.js
 
         # Expect certain responses, but retries of successfully completed commands may return
         # different values:
-        - jstests/core/create_indexes.js
-        - jstests/core/objid5.js
+        - jstests/core/**/create_indexes.js
+        - jstests/core/**/objid5.js
 
         # Expect results to return in a certain order, secondaries may apply ops out of order.
-        - jstests/core/coveredIndex1.js
-        - jstests/core/sortc.js
+        - jstests/core/**/coveredIndex1.js
+        - jstests/core/**/sortc.js
 
-        - jstests/core/bench_test*.js # benchRun() used for writes
-        - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-        - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-        - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-        - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-        - jstests/core/startup_log.js # Checks pid, which is different on each server.
+        - jstests/core/**/bench_test*.js # benchRun() used for writes
+        - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+        - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+        - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+        - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+        - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
         # Creates new mongo connection but won't retry connecting.
-        - jstests/core/shell_connection_strings.js
+        - jstests/core/**/shell_connection_strings.js
 
         # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary.
-        - jstests/core/geo_s2ordering.js
+        - jstests/core/**/geo_s2ordering.js
         - jstests/fle2/**/*.js
         - src/mongo/db/modules/*/jstests/fle2/**/*.js
 
@@ -67,63 +67,63 @@
         # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
         # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
         # server parameter.
-        - jstests/core/set_param1.js
+        - jstests/core/**/set_param1.js
 
         # No-op retries are not ignored by top, the profiler, or opcount.
-        - jstests/core/operation_latency_histogram.js
-        - jstests/core/profile2.js
-        - jstests/core/profile3.js
-        - jstests/core/profile_findandmodify.js
-        - jstests/core/top.js
+        - jstests/core/**/operation_latency_histogram.js
+        - jstests/core/**/profile2.js
+        - jstests/core/**/profile3.js
+        - jstests/core/**/profile_findandmodify.js
+        - jstests/core/**/top.js
         - jstests/core/views/views_stats.js
 
         # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-        - jstests/core/crud_api.js
-        - jstests/core/find_and_modify.js
-        - jstests/core/find_and_modify2.js
-        - jstests/core/find_and_modify_pipeline_update.js
-        - jstests/core/find_and_modify_server6865.js
-        - jstests/core/project_with_collation.js
+        - jstests/core/**/crud_api.js
+        - jstests/core/**/find_and_modify.js
+        - jstests/core/**/find_and_modify2.js
+        - jstests/core/**/find_and_modify_pipeline_update.js
+        - jstests/core/**/find_and_modify_server6865.js
+        - jstests/core/**/project_with_collation.js
 
         # These test run commands using legacy queries, which are not supported on sessions.
-        - jstests/core/comment_field.js
-        - jstests/core/exhaust.js
+        - jstests/core/**/comment_field.js
+        - jstests/core/**/exhaust.js
 
         # Stepdown commands during fsync lock will fail.
-        - jstests/core/currentop.js
-        - jstests/core/fsync.js
-        - jstests/core/killop_drop_collection.js
+        - jstests/core/**/currentop.js
+        - jstests/core/**/fsync.js
+        - jstests/core/**/killop_drop_collection.js
 
         # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-        - jstests/core/shell_connection_strings.js
+        - jstests/core/**/shell_connection_strings.js
 
         # Expect drops/creates to fail or have a certain response:
-        - jstests/core/explain_upsert.js
-        - jstests/core/indexes_multiple_commands.js
+        - jstests/core/**/explain_upsert.js
+        - jstests/core/**/indexes_multiple_commands.js
 
         # Expect certain responses, but retries of successfully completed commands may return
         # different values:
-        - jstests/core/create_indexes.js
-        - jstests/core/objid5.js
+        - jstests/core/**/create_indexes.js
+        - jstests/core/**/objid5.js
 
         # Unacknowledged writes prohibited in an explicit session.
-        - jstests/core/batch_write_command_w0.js
+        - jstests/core/**/batch_write_command_w0.js
 
-        - jstests/core/bench_test*.js # benchRun() used for writes
-        - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-        - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-        - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-        - jstests/core/top.js # Tests read commands (including getMore) against the secondary
-        - jstests/core/drop3.js # getMore is not causally consistent if collection is dropped
-        - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-        - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+        - jstests/core/**/bench_test*.js # benchRun() used for writes
+        - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+        - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+        - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+        - jstests/core/**/top.js # Tests read commands (including getMore) against the secondary
+        - jstests/core/**/drop3.js # getMore is not causally consistent if collection is dropped
+        - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+        - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
 
         # Tests that fail for Causal Consistency as they have statements that do not support
         # non-local read concern.
-        - jstests/core/collation.js
+        - jstests/core/**/collation.js
 
         # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary.
-        - jstests/core/geo_s2ordering.js
+        - jstests/core/**/geo_s2ordering.js
         - jstests/fle2/**/*.js
         - src/mongo/db/modules/*/jstests/fle2/**/*.js
 
diff --git a/buildscripts/resmokeconfig/suites/analyze_shard_key_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/analyze_shard_key_jscore_passthrough.yml
index ed4d1b6352f..57b7e50fe18 100644
--- a/buildscripts/resmokeconfig/suites/analyze_shard_key_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/analyze_shard_key_jscore_passthrough.yml
@@ -6,34 +6,34 @@ selector:
   exclude_files:
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain().
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain().
   # The following tests fail because of divergent dropCollection behavior between standalones and
   # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
   # we expect a second drop to return status OK.
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
   # Profile can only be run against the admin database on mongos.
   - jstests/core/txns/transactions_profiling.js
   - jstests/core/txns/transactions_profiling_with_drops.js
@@ -53,24 +53,24 @@ selector:
   # "Collection test_txns_create_collection.create_new_collection already exists."
   - jstests/core/txns/create_collection.js
   # "assert: [1] != [2] are not equal : getAggPlanStage expects to find 0 or 1 matching stages."
-  - jstests/core/expr_index_use.js
-  - jstests/core/optimized_match_explain.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/optimized_match_explain.js
   # "Attempt to continue an aborted transaction - assert: command worked when it should have failed"
   - jstests/core/txns/finished_transaction_error_handling.js
   # "Error: command worked when it should have failed"
-  - jstests/core/list_indexes_non_existent_ns.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
   # "ns: bypass_document_validation.bypass_output_coll already exists with different options: {}"
-  - jstests/core/bypass_doc_validation.js
+  - jstests/core/**/bypass_doc_validation.js
   # "got stale shardVersion response from shard shard-rs1 at host localhost:20003 :: caused by :: timestamp mismatch detected for test.view_reads_in_transaction_actual_view"
   - jstests/core/txns/view_reads_in_transaction.js
   # "Error: [null] != ["coll"] are not equal"
-  - jstests/core/collection_uuid_index_commands.js
+  - jstests/core/**/collection_uuid_index_commands.js
   # "ns does not exist: test.column_store_index_compression"
-  - jstests/core/column_store_index_compression.js
+  - jstests/core/**/column_store_index_compression.js
   # "Error: [10] != [20] are not equal"
-  - jstests/core/distinct_index1.js
+  - jstests/core/**/distinct_index1.js
   # "Error: [neverCreated] != [neverCreated] are equal : Found db which shouldn't exist:neverCreated"
-  - jstests/core/no_db_created.js
+  - jstests/core/**/no_db_created.js
   # timed out
   - jstests/core/txns/many_txns.js
   - jstests/core/txns/aggregation_in_transaction.js
@@ -78,25 +78,25 @@ selector:
   # "Cannot create new indexes on existing collection test_txns_create_indexes.create_new_indexes in a multi-document transaction."
   - jstests/core/txns/create_indexes.js
   # "MapReduce internal error :: caused by :: PlanExecutor error during aggregation :: caused by :: failed while running command { internalRenameIfOptionsAndIndexesMatch: 1, from: \"test.tmp.agg_out.bb7367ba-7dfb-43ff-9694-8fd49cc0e802\", to: \"test.mr_preserve_indexes_out\", collectionOptions: {}, indexes: [ { v: 2, key: { _id: 1 }, name: \"_id_\" }, { v: 2, key: { _id: \"hashed\" }, name: \"_id_hashed\" } ], writeConcern: { w: \"majority\", wtimeout: 0, provenance: \"implicitDefault\" } } :: caused by :: cannot rename to sharded collection 'test.mr_preserve_indexes_out'"
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/mr_preserve_indexes.js
   # "TypeError: result.shards['shard-rs0'] is undefined"
   - jstests/core/timeseries/bucket_unpacking_with_sort.js
   # "Error: [1] != [2] are not equal"
-  - jstests/core/create_indexes.js
+  - jstests/core/**/create_indexes.js
   # "Error: [3] != [2] are not equal"
-  - jstests/core/bad_index_plugin.js
+  - jstests/core/**/bad_index_plugin.js
   # "Error: [1] != [2] are not equal"
-  - jstests/core/sortk.js
+  - jstests/core/**/sortk.js
   # "Collection test_txns_create_collection_parallel.create_new_collection already exists."
   - jstests/core/txns/create_collection_parallel.js
   # "Invalid system namespace: rename8.system.foo"
-  - jstests/core/rename_collection_system_db.js
+  - jstests/core/**/rename_collection_system_db.js
   # "Error: [1] != [2] are not equal"
   - jstests/core/timeseries/timeseries_reopened_bucket_insert.js
   # "Cannot create new indexes on existing collection test_txns_create_indexes_parallel.create_new_collection in a multi-document transaction."
   - jstests/core/txns/create_indexes_parallel.js
   # "Error: [4] != [7] are not equal : wrong count result"
-  - jstests/core/explain_count.js
+  - jstests/core/**/explain_count.js
   # "Error: [1] != [0] are not equal"
   - jstests/core/timeseries/nondefault_collation.js
   # "Error: [1] != [2] are not equal : unexpected number of indexes in collection"
@@ -106,13 +106,13 @@ selector:
   # "Error on remote shard localhost:20253 :: caused by :: Executor error during getMore :: caused by :: BoundedSorter input is too out-of-order."
   - jstests/core/timeseries/bucket_unpacking_with_sort_extended_range.js
   # "Error: assert failed : getPlanStage expects to find 0 or 1 matching stages."
-  - jstests/core/index_multikey.js
+  - jstests/core/**/index_multikey.js
   # "Error: [20] != [40] are not equal : H "
-  - jstests/core/explain1.js
+  - jstests/core/**/explain1.js
   # "Error: assert failed : Expected an index scan for predicate"
   - jstests/core/timeseries/timeseries_index_partial.js
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_against_mongod_not_mongos
diff --git a/buildscripts/resmokeconfig/suites/analyze_shard_key_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/analyze_shard_key_kill_primary_jscore_passthrough.yml
index a8a7c2ad162..73205329695 100644
--- a/buildscripts/resmokeconfig/suites/analyze_shard_key_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/analyze_shard_key_kill_primary_jscore_passthrough.yml
@@ -7,77 +7,77 @@ selector:
   exclude_files:
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
 
   ##
   ## Misc. reasons.
   ##
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # Expects explain to have field executionStats.executionSuccess = true
-  - jstests/core/geo_2d_explain.js
+  - jstests/core/**/geo_2d_explain.js
 
   exclude_with_any_tags:
   - does_not_support_stepdowns
diff --git a/buildscripts/resmokeconfig/suites/analyze_shard_key_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/analyze_shard_key_stepdown_jscore_passthrough.yml
index 1eb22f36120..af5a2d584e4 100644
--- a/buildscripts/resmokeconfig/suites/analyze_shard_key_stepdown_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/analyze_shard_key_stepdown_jscore_passthrough.yml
@@ -7,74 +7,74 @@ selector:
   exclude_files:
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
 
   ##
   ## Misc. reasons.
   ##
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   exclude_with_any_tags:
   - does_not_support_stepdowns
diff --git a/buildscripts/resmokeconfig/suites/analyze_shard_key_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/analyze_shard_key_terminate_primary_jscore_passthrough.yml
index e8cbeee37e3..7b7e9a8f338 100644
--- a/buildscripts/resmokeconfig/suites/analyze_shard_key_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/analyze_shard_key_terminate_primary_jscore_passthrough.yml
@@ -7,74 +7,74 @@ selector:
   exclude_files:
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
 
   ##
   ## Misc. reasons.
   ##
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   exclude_with_any_tags:
   - does_not_support_stepdowns
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
index bb0ce727d8f..7ebde54cccd 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
@@ -6,35 +6,35 @@ selector:
   exclude_files:
   # Has conditional logic for standalone servers and replica sets, but can't distinguish the two
   # when connected to mongos.
-  - jstests/core/write_result.js
+  - jstests/core/**/write_result.js
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain()
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
   # The following tests fail because of divergent dropCollection behavior between standalones and
   # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
   # we expect a second drop to return status OK.
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
   # This test uses `benchRun` which spawns connections which do not inherit the causal session.
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/benchrun_pipeline_updates.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
index a15a6fffc13..0260c3bbc3f 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
@@ -8,36 +8,36 @@ selector:
   exclude_files:
   # Has conditional logic for standalone servers and replica sets, but can't distinguish the two
   # when connected to mongos.
-  - jstests/core/write_result.js
+  - jstests/core/**/write_result.js
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain()
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
 
   # The following tests fail because of divergent dropCollection behavior between standalones and
   # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
   # we expect a second drop to return status OK.
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
   # This test uses `benchRun` which spawns connections which do not inherit the causal session.
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/benchrun_pipeline_updates.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
index 82c3c58a019..68300acad79 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
@@ -19,47 +19,47 @@ selector:
   - jstests/core/*[aA]uth*.js
   # Has conditional logic for standalone servers and replica sets, but can't distinguish the two
   # when connected to mongos.
-  - jstests/core/write_result.js
+  - jstests/core/**/write_result.js
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain()
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
   # Logical sessions require that only one user be authenticated,
   # but this suite puts us in a multi-auth state.
-  - jstests/core/list_all_sessions.js # Too many users authenticated
-  - jstests/core/list_sessions.js # Too many users authenticated
+  - jstests/core/**/list_all_sessions.js # Too many users authenticated
+  - jstests/core/**/list_sessions.js # Too many users authenticated
   # The following tests fail because of divergent dropCollection behavior between standalones and
   # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
   # we expect a second drop to return status OK.
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
 
   # These include operations the root user auth'd on the test database is not authorized to perform,
   # e.g. reading system.views, dropping or creating system collections.
-  - jstests/core/list_collections_no_views.js
-  - jstests/core/rename_collection_system_db.js
+  - jstests/core/**/list_collections_no_views.js
+  - jstests/core/**/rename_collection_system_db.js
   - jstests/core/views/invalid_system_views.js
   - jstests/core/views/view_with_invalid_dbname.js
   - jstests/core/views/views_creation.js
   - jstests/core/views/views_drop.js
-  - jstests/core/disallow_system_views_user_writes.js
+  - jstests/core/**/disallow_system_views_user_writes.js
   - jstests/core/timeseries/bucket_granularity.js
 
   # These tests expect listCollections to return system.bucket.* collections, which are filtered
@@ -67,11 +67,11 @@ selector:
   # Refer to filter in cluster_list_collections_cmd.cpp
   - jstests/core/timeseries/timeseries_*.js
   # This test uses `benchRun` which spawns connections which do not inherit the causal session.
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/benchrun_pipeline_updates.js
 
   # In the context of auth on mongos, illegal namespaces trigger a different error code than they do
   # on mongod. To keep the test simple, we avoid running it against a mongos when auth is enabled.
-  - jstests/core/illegal_cmd_namespace.js
+  - jstests/core/**/illegal_cmd_namespace.js
 
   exclude_with_any_tags:
   - assumes_against_mongod_not_mongos
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml
index d8556569ca3..9a9d6a9193e 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml
@@ -10,8 +10,8 @@ selector:
   # non-transaction snapshot reads.
   - jstests/core/txns/**/*.js
   # These tests use benchRun(), which isn't configured to use the overridden writeConcern.
-  - jstests/core/bench_test*.js
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/bench_test*.js
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
   exclude_with_any_tags:
   - assumes_standalone_mongod
   # The next two tags correspond to the special errors thrown by the
diff --git a/buildscripts/resmokeconfig/suites/change_streams_downgrade.yml b/buildscripts/resmokeconfig/suites/change_streams_downgrade.yml
index 8f675d70fab..5b4078999c2 100644
--- a/buildscripts/resmokeconfig/suites/change_streams_downgrade.yml
+++ b/buildscripts/resmokeconfig/suites/change_streams_downgrade.yml
@@ -10,196 +10,196 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
 
   ##
   ## Limitations with the way the runner file injects transactions.
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # TODO: SERVER-38207 Cannot insert document with MaxKey shard key.
-  - jstests/core/type8.js
+  - jstests/core/**/type8.js
 
   ##
   ## Some aggregation stages don't support snapshot readconcern.
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Misc. reasons.
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -207,65 +207,65 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # dropDatabase is not resilient to stepdowns on sharded cluster
-  - jstests/core/dropdb.js
+  - jstests/core/**/dropdb.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # auto_retry_on_network_error.js will timeout with assert.soon and give a different error from
   # what test expects. Excluding from suite since it doesn't really do any database operations, so
   # it doesn't provide value here.
-  - jstests/core/connection_string_validation.js
+  - jstests/core/**/connection_string_validation.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # Examines _id of upserted document.
-  - jstests/core/find_and_modify_server7660.js
-  - jstests/core/upsert_shell.js
+  - jstests/core/**/find_and_modify_server7660.js
+  - jstests/core/**/upsert_shell.js
 
   # This file is testing resmoke's multiversion framework, not Server behavior
-  - jstests/core/mixed_version_replica_set.js
+  - jstests/core/**/mixed_version_replica_set.js
 
   exclude_with_any_tags:
   ##
diff --git a/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml b/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
index a9c4719a89b..01d83a673f4 100644
--- a/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
@@ -10,61 +10,61 @@ selector:
   exclude_files:
 
   # Assumes the _id index is real.
-  - jstests/core/collmod_convert_to_ttl.js
-  - jstests/core/index_create_too_many.js
+  - jstests/core/**/collmod_convert_to_ttl.js
+  - jstests/core/**/index_create_too_many.js
   # Uses returnKey().
-  - jstests/core/index_diag.js
+  - jstests/core/**/index_diag.js
   # Expects 'idIndex' field in the listCollections output.
-  - jstests/core/list_collections1.js
-  - jstests/core/explain_shell_helpers.js
+  - jstests/core/**/list_collections1.js
+  - jstests/core/**/explain_shell_helpers.js
   - jstests/core/txns/list_collections_not_blocked_by_txn.js
   # Doesn't expect clusteredIndex options on the collection.
-  - jstests/core/list_collections_filter.js
+  - jstests/core/**/list_collections_filter.js
   # Compares the result of listIndexes to numIndexesBefore in the createIndex output.
-  - jstests/core/index_signature.js
+  - jstests/core/**/index_signature.js
   # Assumes the collection is not clustered by default.
   - jstests/core/timeseries/clustered_index_options.js
   - jstests/core/timeseries/timeseries_expire_collmod.js
   # Doesn't expect a failpoint to be enabled.
-  - jstests/core/set_param1.js
+  - jstests/core/**/set_param1.js
   # Expects a correct index count in dbStats.
-  - jstests/core/dbstats.js
+  - jstests/core/**/dbstats.js
   # Expects queries on _id to use IDHACK in explain.
-  - jstests/core/agg_hint.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/projection_dotted_paths.js
-  - jstests/core/wildcard_index_projection.js
-  - jstests/core/find_and_modify_pipeline_update.js
-  - jstests/core/update_pipeline_shell_helpers.js
-  - jstests/core/idhack.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/projection_dotted_paths.js
+  - jstests/core/**/wildcard_index_projection.js
+  - jstests/core/**/find_and_modify_pipeline_update.js
+  - jstests/core/**/update_pipeline_shell_helpers.js
+  - jstests/core/**/idhack.js
   # Uses the unsupported 'autoIndexId' option.
-  - jstests/core/queryoptimizera.js
-  - jstests/core/index9.js
+  - jstests/core/**/queryoptimizera.js
+  - jstests/core/**/index9.js
   # Expects the collection creation options not to change.
-  - jstests/core/internal_rename_if_options_and_indexes_match.js
+  - jstests/core/**/internal_rename_if_options_and_indexes_match.js
   # The _id index is expected to not have a 'unique' field.
-  - jstests/core/list_indexes.js
+  - jstests/core/**/list_indexes.js
   # Expects createIndex with 'clustered' option fails on a non-clustered collection.
-  - jstests/core/clustered_collection_create_index_clustered.js
+  - jstests/core/**/clustered_collection_create_index_clustered.js
   # Tries to drop the clustered index.
-  - jstests/core/drop_index.js
-  - jstests/core/drop_indexes.js
+  - jstests/core/**/drop_index.js
+  - jstests/core/**/drop_indexes.js
   # Expects to see IXSCAN over _id (cluster key).
-  - jstests/core/find_and_modify_hint.js
-  - jstests/core/covered_index_sort_2.js
+  - jstests/core/**/find_and_modify_hint.js
+  - jstests/core/**/covered_index_sort_2.js
   # TODO (SERVER-60824): Resolve sort exceeded memory limit.
-  - jstests/core/sortg.js
+  - jstests/core/**/sortg.js
   # Expects duplicate key error to have _id index use specified.
-  - jstests/core/uniqueness.js
+  - jstests/core/**/uniqueness.js
   # Expects to see the usage of _id_ index by using $indexStats.
-  - jstests/core/index_stats.js
+  - jstests/core/**/index_stats.js
   # TODO (SERVER-62707): bound collscans with regexes.
-  - jstests/core/index_bounds_pipe.js
+  - jstests/core/**/index_bounds_pipe.js
   # Expects an index on _id to cover the query.
-  - jstests/core/covered_index_simple_id.js
+  - jstests/core/**/covered_index_simple_id.js
   # TODO (SERVER-61259): $text not supported: "No query solutions"
-  - jstests/core/fts6.js
-  - jstests/core/fts_projection.js
+  - jstests/core/**/fts6.js
+  - jstests/core/**/fts_projection.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/core_auth.yml b/buildscripts/resmokeconfig/suites/core_auth.yml
index a85a88f589c..f416c77fa0b 100644
--- a/buildscripts/resmokeconfig/suites/core_auth.yml
+++ b/buildscripts/resmokeconfig/suites/core_auth.yml
@@ -19,7 +19,7 @@ selector:
   # Skip any tests that run with auth explicitly.
   - jstests/core/**/*[aA]uth*.js
   # Commands using UUIDs are not compatible with name-based auth
-  - jstests/core/commands_with_uuid.js
+  - jstests/core/**/commands_with_uuid.js
   exclude_with_any_tags:
   # Multiple users cannot be authenticated on one connection within a session.
   - creates_and_authenticates_user
diff --git a/buildscripts/resmokeconfig/suites/core_column_store_indexes.yml b/buildscripts/resmokeconfig/suites/core_column_store_indexes.yml
index ae21c3713cf..ccef09e4a24 100644
--- a/buildscripts/resmokeconfig/suites/core_column_store_indexes.yml
+++ b/buildscripts/resmokeconfig/suites/core_column_store_indexes.yml
@@ -8,8 +8,8 @@ selector:
   exclude_files:
   # TODO SERVER-68339 UBSAN has spurious warnings for column store indexes' encoding of large
   # doubles.
-  - jstests/core/index_bounds_number_edge_cases.js
-  - jstests/core/type_bracket.js
+  - jstests/core/**/index_bounds_number_edge_cases.js
+  - jstests/core/**/type_bracket.js
 
   exclude_with_any_tags:
   - assumes_no_implicit_index_creation
diff --git a/buildscripts/resmokeconfig/suites/core_minimum_batch_size.yml b/buildscripts/resmokeconfig/suites/core_minimum_batch_size.yml
index cd7b0275421..2bb9df2be2e 100644
--- a/buildscripts/resmokeconfig/suites/core_minimum_batch_size.yml
+++ b/buildscripts/resmokeconfig/suites/core_minimum_batch_size.yml
@@ -7,13 +7,13 @@ selector:
   # Transactions are not supported on MongoDB standalone nodes.
   - jstests/core/txns/**/*.js
   # The following tests fail when specifying a minimal batchSize:
-  - jstests/core/find9.js # Reduction of objsLeftInBatch.
-  - jstests/core/finda.js # Reduction of objsLeftInBatch.
-  - jstests/core/profile1.js # Extra operation for a getmore.
-  - jstests/core/profile2.js # Extra operation for a getmore.
-  - jstests/core/sortk.js # Negative limit value changes result to batchSize.
-  - jstests/core/tailable_skip_limit.js # Negative limit value changes result to batchSize.
-  - jstests/core/exhaust.js # Negative limit value changes result to batchSize.
+  - jstests/core/**/find9.js # Reduction of objsLeftInBatch.
+  - jstests/core/**/finda.js # Reduction of objsLeftInBatch.
+  - jstests/core/**/profile1.js # Extra operation for a getmore.
+  - jstests/core/**/profile2.js # Extra operation for a getmore.
+  - jstests/core/**/sortk.js # Negative limit value changes result to batchSize.
+  - jstests/core/**/tailable_skip_limit.js # Negative limit value changes result to batchSize.
+  - jstests/core/**/exhaust.js # Negative limit value changes result to batchSize.
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml
index 52c443237e4..0bb4882ae5c 100755
--- a/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml
@@ -15,382 +15,382 @@ selector:
   - jstests/core/txns/**/*.js
 
   # These tests produce different error codes depending on which parser implementation.
-  - jstests/core/sort_with_meta_operator.js
+  - jstests/core/**/sort_with_meta_operator.js
 
   # TODO SERVER-50239 Enable $jsonSchema tests against the CST.
   - jstests/core/json_schema/**/*.js
 
   # TODO SERVER-50851 Implement $sampleRate in CST.
-  - jstests/core/sample_rate.js
+  - jstests/core/**/sample_rate.js
 
   # TODO SERVER-48847 Enable tests with comparison operators.
-  - jstests/core/background_index_multikey.js
-  - jstests/core/wildcard_index_collation.js
-  - jstests/core/wildcard_index_hint.js
-  - jstests/core/wildcard_index_return_key.js
-  - jstests/core/wildcard_index_projection.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arraymatch6.js
-  - jstests/core/update_arraymatch8.js
-  - jstests/core/update_min_max_examples.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/count9.js
-  - jstests/core/find_and_modify_server6588.js
-  - jstests/core/find_and_modify_server6909.js
-  - jstests/core/find_and_modify3.js
-  - jstests/core/index6.js
-  - jstests/core/mr_scope.js
-  - jstests/core/profile_hide_index.js
-  - jstests/core/profile_query_hash.js
-  - jstests/core/agg_hint.js
-  - jstests/core/all2.js
-  - jstests/core/all3.js
-  - jstests/core/and.js
-  - jstests/core/and.js
-  - jstests/core/and_or_index_sort.js
-  - jstests/core/and_or_nested.js
-  - jstests/core/andor.js
-  - jstests/core/array1.js
-  - jstests/core/array4.js
-  - jstests/core/array_comparison_correctness.js
-  - jstests/core/array_index_and_nonIndex_consistent.js
-  - jstests/core/array_match1.js
-  - jstests/core/array_match3.js
-  - jstests/core/array_match4.js
-  - jstests/core/arrayfind1.js
-  - jstests/core/arrayfind10.js
-  - jstests/core/arrayfind2.js
-  - jstests/core/arrayfind3.js
-  - jstests/core/arrayfind4.js
-  - jstests/core/arrayfind6.js
-  - jstests/core/arrayfind7.js
-  - jstests/core/arrayfind8.js
-  - jstests/core/arrayfind9.js
-  - jstests/core/arrayfinda.js
-  - jstests/core/arrayfindb.js
-  - jstests/core/background_unique_indexes.js
-  - jstests/core/batch_size.js
-  - jstests/core/batch_write_command_update.js
-  - jstests/core/bench_test1.js
-  - jstests/core/bench_test2.js
-  - jstests/core/bindata_eq.js
-  - jstests/core/bindata_indexonly.js
-  - jstests/core/batched_multi_deletes.js
-  - jstests/core/capped_update.js
-  - jstests/core/collation.js
-  - jstests/core/collation_find_and_modify.js
-  - jstests/core/collation_plan_cache.js
-  - jstests/core/collation_update.js
-  - jstests/core/collection_truncate.js
-  - jstests/core/command_json_schema_field.js
-  - jstests/core/command_let_variables.js
-  - jstests/core/computed_projections.js
-  - jstests/core/connection_string_validation.js
-  - jstests/core/count11.js
-  - jstests/core/count4.js
-  - jstests/core/count5.js
-  - jstests/core/count7.js
-  - jstests/core/countb.js
-  - jstests/core/countc.js
-  - jstests/core/covered_index_compound_1.js
-  - jstests/core/covered_index_negative_1.js
-  - jstests/core/covered_index_simple_1.js
-  - jstests/core/covered_index_simple_2.js
-  - jstests/core/covered_index_simple_3.js
-  - jstests/core/covered_index_simple_id.js
-  - jstests/core/covered_index_sort_1.js
-  - jstests/core/covered_index_sort_no_fetch_optimization.js
-  - jstests/core/covered_multikey.js
-  - jstests/core/coveredIndex1.js
-  - jstests/core/crud_api.js
-  - jstests/core/currentop_cursors.js
-  - jstests/core/cursor3.js
-  - jstests/core/cursor4.js
-  - jstests/core/cursor5.js
-  - jstests/core/cursor6.js
-  - jstests/core/cursor7.js
-  - jstests/core/date2.js
-  - jstests/core/date3.js
-  - jstests/core/delx.js
-  - jstests/core/distinct1.js
-  - jstests/core/distinct3.js
-  - jstests/core/distinct_index1.js
-  - jstests/core/distinct_multikey.js
-  - jstests/core/distinct_multikey_dotted_path.js
-  - jstests/core/distinct_with_hashed_index.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_invalid_validators.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/dotted_path_in_null.js
-  - jstests/core/elemmatch_or_pushdown.js
-  - jstests/core/elemmatch_projection.js
-  - jstests/core/positional_projection.js
-  - jstests/core/exists.js
-  - jstests/core/existsa.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/explain5.js
-  - jstests/core/explain6.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/explain_find.js
-  - jstests/core/explain_find_and_modify.js
-  - jstests/core/explain_large_bounds.js
-  - jstests/core/explain_multi_plan.js
-  - jstests/core/explain_server_params.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/explain_sort_type.js
-  - jstests/core/explain_winning_plan.js
-  - jstests/core/merge_sort_collation.js
-  - jstests/core/explode_for_sort_fetch.js
-  - jstests/core/expr.js
-  - jstests/core/expr_index_use.js
-  - jstests/core/expr_or_pushdown.js
-  - jstests/core/expr_valid_positions.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/filemd5.js
-  - jstests/core/find6.js
-  - jstests/core/find7.js
-  - jstests/core/find8.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify4.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/find_and_modify_empty_coll.js
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/find_and_modify_server6226.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/find_covered_projection.js
-  - jstests/core/find_dedup.js
-  - jstests/core/find_project_sort.js
-  - jstests/core/finda.js
-  - jstests/core/fts_mix.js
-  - jstests/core/geo2.js
-  - jstests/core/geo3.js
-  - jstests/core/geo6.js
-  - jstests/core/geo9.js
-  - jstests/core/geo_2d_explain.js
-  - jstests/core/geo_2d_trailing_fields.js
-  - jstests/core/geo_2d_with_geojson_point.js
-  - jstests/core/geo_array2.js
-  - jstests/core/geo_big_polygon3.js
-  - jstests/core/geo_borders.js
-  - jstests/core/geo_center_sphere2.js
-  - jstests/core/geo_circle2.js
-  - jstests/core/geo_distinct.js
-  - jstests/core/geo_exactfetch.js
-  - jstests/core/geo_max.js
-  - jstests/core/geo_mindistance.js
-  - jstests/core/geo_mindistance_boundaries.js
-  - jstests/core/geo_multikey0.js
-  - jstests/core/geo_multinest1.js
-  - jstests/core/geo_near_random1.js
-  - jstests/core/geo_near_random2.js
-  - jstests/core/geo_nearwithin.js
-  - jstests/core/geo_oob_sphere.js
-  - jstests/core/geo_operator_crs.js
-  - jstests/core/geo_or.js
-  - jstests/core/geo_queryoptimizer.js
-  - jstests/core/geo_regex0.js
-  - jstests/core/geo_regex0.js
-  - jstests/core/geo_s2explain.js
-  - jstests/core/geo_s2index.js
-  - jstests/core/geo_s2near.js
-  - jstests/core/geo_s2near_equator_opposite.js
-  - jstests/core/geo_s2nearComplex.js
-  - jstests/core/geo_s2nearcorrect.js
-  - jstests/core/geo_s2nongeoarray.js
-  - jstests/core/geo_s2nonstring.js
-  - jstests/core/geo_s2nopoints.js
-  - jstests/core/geo_small_large.js
-  - jstests/core/geo_sort1.js
-  - jstests/core/geo_uniqueDocs2.js
-  - jstests/core/geo_update.js
-  - jstests/core/geo_update1.js
-  - jstests/core/geo_update2.js
-  - jstests/core/geo_update_btree2.js
-  - jstests/core/geo_update_dedup.js
-  - jstests/core/geo_validate.js
-  - jstests/core/geo_withinquery.js
-  - jstests/core/geoa.js
-  - jstests/core/geoc.js
-  - jstests/core/geof.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/grow_hash_table.js
-  - jstests/core/hashed_index_covered_queries.js
-  - jstests/core/hashed_index_queries.js
-  - jstests/core/hashed_index_queries_with_logical_operators.js
-  - jstests/core/hashed_index_sort.js
-  - jstests/core/hashed_index_with_arrays.js
-  - jstests/core/hashed_partial_and_sparse_index.js
-  - jstests/core/hint1.js
-  - jstests/core/id1.js
-  - jstests/core/idhack.js
-  - jstests/core/in.js
-  - jstests/core/in2.js
-  - jstests/core/in3.js
-  - jstests/core/in4.js
-  - jstests/core/in5.js
-  - jstests/core/in6.js
-  - jstests/core/in7.js
-  - jstests/core/in8.js
-  - jstests/core/in_with_mixed_values.js
-  - jstests/core/inc-SERVER-7446.js
-  - jstests/core/inc1.js
-  - jstests/core/inc2.js
-  - jstests/core/inc3.js
-  - jstests/core/index1.js
-  - jstests/core/index13.js
-  - jstests/core/index2.js
-  - jstests/core/index4.js
-  - jstests/core/index_arr2.js
-  - jstests/core/index_bigkeys.js
-  - jstests/core/index_bounds_code.js
-  - jstests/core/index_bounds_maxkey.js
-  - jstests/core/index_bounds_minkey.js
-  - jstests/core/index_bounds_number_edge_cases.js
-  - jstests/core/index_bounds_object.js
-  - jstests/core/index_bounds_pipe.js
-  - jstests/core/index_bounds_timestamp.js
-  - jstests/core/index_check3.js
-  - jstests/core/index_check5.js
-  - jstests/core/index_check6.js
-  - jstests/core/index_check7.js
-  - jstests/core/index_decimal.js
-  - jstests/core/index_filter_commands.js
-  - jstests/core/index_filter_on_hidden_index.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_2dsphere.js
-  - jstests/core/index_partial_create_drop.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/index_partial_validate.js
-  - jstests/core/index_signature.js
-  - jstests/core/index_sort_within_multiple_point_ranges.js
-  - jstests/core/index_stats.js
-  - jstests/core/indexc.js
-  - jstests/core/indexg.js
-  - jstests/core/indexj.js
-  - jstests/core/indexl.js
-  - jstests/core/indexm.js
-  - jstests/core/indexn.js
-  - jstests/core/indexr.js
-  - jstests/core/indexs.js
-  - jstests/core/indexs.js
-  - jstests/core/indexu.js
-  - jstests/core/json1.js
+  - jstests/core/**/background_index_multikey.js
+  - jstests/core/**/wildcard_index_collation.js
+  - jstests/core/**/wildcard_index_hint.js
+  - jstests/core/**/wildcard_index_return_key.js
+  - jstests/core/**/wildcard_index_projection.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arraymatch6.js
+  - jstests/core/**/update_arraymatch8.js
+  - jstests/core/**/update_min_max_examples.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/count9.js
+  - jstests/core/**/find_and_modify_server6588.js
+  - jstests/core/**/find_and_modify_server6909.js
+  - jstests/core/**/find_and_modify3.js
+  - jstests/core/**/index6.js
+  - jstests/core/**/mr_scope.js
+  - jstests/core/**/profile_hide_index.js
+  - jstests/core/**/profile_query_hash.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/all2.js
+  - jstests/core/**/all3.js
+  - jstests/core/**/and.js
+  - jstests/core/**/and.js
+  - jstests/core/**/and_or_index_sort.js
+  - jstests/core/**/and_or_nested.js
+  - jstests/core/**/andor.js
+  - jstests/core/**/array1.js
+  - jstests/core/**/array4.js
+  - jstests/core/**/array_comparison_correctness.js
+  - jstests/core/**/array_index_and_nonIndex_consistent.js
+  - jstests/core/**/array_match1.js
+  - jstests/core/**/array_match3.js
+  - jstests/core/**/array_match4.js
+  - jstests/core/**/arrayfind1.js
+  - jstests/core/**/arrayfind10.js
+  - jstests/core/**/arrayfind2.js
+  - jstests/core/**/arrayfind3.js
+  - jstests/core/**/arrayfind4.js
+  - jstests/core/**/arrayfind6.js
+  - jstests/core/**/arrayfind7.js
+  - jstests/core/**/arrayfind8.js
+  - jstests/core/**/arrayfind9.js
+  - jstests/core/**/arrayfinda.js
+  - jstests/core/**/arrayfindb.js
+  - jstests/core/**/background_unique_indexes.js
+  - jstests/core/**/batch_size.js
+  - jstests/core/**/batch_write_command_update.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/bench_test2.js
+  - jstests/core/**/bindata_eq.js
+  - jstests/core/**/bindata_indexonly.js
+  - jstests/core/**/batched_multi_deletes.js
+  - jstests/core/**/capped_update.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/collation_find_and_modify.js
+  - jstests/core/**/collation_plan_cache.js
+  - jstests/core/**/collation_update.js
+  - jstests/core/**/collection_truncate.js
+  - jstests/core/**/command_json_schema_field.js
+  - jstests/core/**/command_let_variables.js
+  - jstests/core/**/computed_projections.js
+  - jstests/core/**/connection_string_validation.js
+  - jstests/core/**/count11.js
+  - jstests/core/**/count4.js
+  - jstests/core/**/count5.js
+  - jstests/core/**/count7.js
+  - jstests/core/**/countb.js
+  - jstests/core/**/countc.js
+  - jstests/core/**/covered_index_compound_1.js
+  - jstests/core/**/covered_index_negative_1.js
+  - jstests/core/**/covered_index_simple_1.js
+  - jstests/core/**/covered_index_simple_2.js
+  - jstests/core/**/covered_index_simple_3.js
+  - jstests/core/**/covered_index_simple_id.js
+  - jstests/core/**/covered_index_sort_1.js
+  - jstests/core/**/covered_index_sort_no_fetch_optimization.js
+  - jstests/core/**/covered_multikey.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/currentop_cursors.js
+  - jstests/core/**/cursor3.js
+  - jstests/core/**/cursor4.js
+  - jstests/core/**/cursor5.js
+  - jstests/core/**/cursor6.js
+  - jstests/core/**/cursor7.js
+  - jstests/core/**/date2.js
+  - jstests/core/**/date3.js
+  - jstests/core/**/delx.js
+  - jstests/core/**/distinct1.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/distinct_multikey.js
+  - jstests/core/**/distinct_multikey_dotted_path.js
+  - jstests/core/**/distinct_with_hashed_index.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_invalid_validators.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/dotted_path_in_null.js
+  - jstests/core/**/elemmatch_or_pushdown.js
+  - jstests/core/**/elemmatch_projection.js
+  - jstests/core/**/positional_projection.js
+  - jstests/core/**/exists.js
+  - jstests/core/**/existsa.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/explain5.js
+  - jstests/core/**/explain6.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/explain_find.js
+  - jstests/core/**/explain_find_and_modify.js
+  - jstests/core/**/explain_large_bounds.js
+  - jstests/core/**/explain_multi_plan.js
+  - jstests/core/**/explain_server_params.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/explain_sort_type.js
+  - jstests/core/**/explain_winning_plan.js
+  - jstests/core/**/merge_sort_collation.js
+  - jstests/core/**/explode_for_sort_fetch.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/expr_or_pushdown.js
+  - jstests/core/**/expr_valid_positions.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/filemd5.js
+  - jstests/core/**/find6.js
+  - jstests/core/**/find7.js
+  - jstests/core/**/find8.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify4.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/find_and_modify_empty_coll.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/find_and_modify_server6226.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/find_covered_projection.js
+  - jstests/core/**/find_dedup.js
+  - jstests/core/**/find_project_sort.js
+  - jstests/core/**/finda.js
+  - jstests/core/**/fts_mix.js
+  - jstests/core/**/geo2.js
+  - jstests/core/**/geo3.js
+  - jstests/core/**/geo6.js
+  - jstests/core/**/geo9.js
+  - jstests/core/**/geo_2d_explain.js
+  - jstests/core/**/geo_2d_trailing_fields.js
+  - jstests/core/**/geo_2d_with_geojson_point.js
+  - jstests/core/**/geo_array2.js
+  - jstests/core/**/geo_big_polygon3.js
+  - jstests/core/**/geo_borders.js
+  - jstests/core/**/geo_center_sphere2.js
+  - jstests/core/**/geo_circle2.js
+  - jstests/core/**/geo_distinct.js
+  - jstests/core/**/geo_exactfetch.js
+  - jstests/core/**/geo_max.js
+  - jstests/core/**/geo_mindistance.js
+  - jstests/core/**/geo_mindistance_boundaries.js
+  - jstests/core/**/geo_multikey0.js
+  - jstests/core/**/geo_multinest1.js
+  - jstests/core/**/geo_near_random1.js
+  - jstests/core/**/geo_near_random2.js
+  - jstests/core/**/geo_nearwithin.js
+  - jstests/core/**/geo_oob_sphere.js
+  - jstests/core/**/geo_operator_crs.js
+  - jstests/core/**/geo_or.js
+  - jstests/core/**/geo_queryoptimizer.js
+  - jstests/core/**/geo_regex0.js
+  - jstests/core/**/geo_regex0.js
+  - jstests/core/**/geo_s2explain.js
+  - jstests/core/**/geo_s2index.js
+  - jstests/core/**/geo_s2near.js
+  - jstests/core/**/geo_s2near_equator_opposite.js
+  - jstests/core/**/geo_s2nearComplex.js
+  - jstests/core/**/geo_s2nearcorrect.js
+  - jstests/core/**/geo_s2nongeoarray.js
+  - jstests/core/**/geo_s2nonstring.js
+  - jstests/core/**/geo_s2nopoints.js
+  - jstests/core/**/geo_small_large.js
+  - jstests/core/**/geo_sort1.js
+  - jstests/core/**/geo_uniqueDocs2.js
+  - jstests/core/**/geo_update.js
+  - jstests/core/**/geo_update1.js
+  - jstests/core/**/geo_update2.js
+  - jstests/core/**/geo_update_btree2.js
+  - jstests/core/**/geo_update_dedup.js
+  - jstests/core/**/geo_validate.js
+  - jstests/core/**/geo_withinquery.js
+  - jstests/core/**/geoa.js
+  - jstests/core/**/geoc.js
+  - jstests/core/**/geof.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/grow_hash_table.js
+  - jstests/core/**/hashed_index_covered_queries.js
+  - jstests/core/**/hashed_index_queries.js
+  - jstests/core/**/hashed_index_queries_with_logical_operators.js
+  - jstests/core/**/hashed_index_sort.js
+  - jstests/core/**/hashed_index_with_arrays.js
+  - jstests/core/**/hashed_partial_and_sparse_index.js
+  - jstests/core/**/hint1.js
+  - jstests/core/**/id1.js
+  - jstests/core/**/idhack.js
+  - jstests/core/**/in.js
+  - jstests/core/**/in2.js
+  - jstests/core/**/in3.js
+  - jstests/core/**/in4.js
+  - jstests/core/**/in5.js
+  - jstests/core/**/in6.js
+  - jstests/core/**/in7.js
+  - jstests/core/**/in8.js
+  - jstests/core/**/in_with_mixed_values.js
+  - jstests/core/**/inc-SERVER-7446.js
+  - jstests/core/**/inc1.js
+  - jstests/core/**/inc2.js
+  - jstests/core/**/inc3.js
+  - jstests/core/**/index1.js
+  - jstests/core/**/index13.js
+  - jstests/core/**/index2.js
+  - jstests/core/**/index4.js
+  - jstests/core/**/index_arr2.js
+  - jstests/core/**/index_bigkeys.js
+  - jstests/core/**/index_bounds_code.js
+  - jstests/core/**/index_bounds_maxkey.js
+  - jstests/core/**/index_bounds_minkey.js
+  - jstests/core/**/index_bounds_number_edge_cases.js
+  - jstests/core/**/index_bounds_object.js
+  - jstests/core/**/index_bounds_pipe.js
+  - jstests/core/**/index_bounds_timestamp.js
+  - jstests/core/**/index_check3.js
+  - jstests/core/**/index_check5.js
+  - jstests/core/**/index_check6.js
+  - jstests/core/**/index_check7.js
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_filter_commands.js
+  - jstests/core/**/index_filter_on_hidden_index.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_2dsphere.js
+  - jstests/core/**/index_partial_create_drop.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/index_partial_validate.js
+  - jstests/core/**/index_signature.js
+  - jstests/core/**/index_sort_within_multiple_point_ranges.js
+  - jstests/core/**/index_stats.js
+  - jstests/core/**/indexc.js
+  - jstests/core/**/indexg.js
+  - jstests/core/**/indexj.js
+  - jstests/core/**/indexl.js
+  - jstests/core/**/indexm.js
+  - jstests/core/**/indexn.js
+  - jstests/core/**/indexr.js
+  - jstests/core/**/indexs.js
+  - jstests/core/**/indexs.js
+  - jstests/core/**/indexu.js
+  - jstests/core/**/json1.js
   - jstests/core/json_schema/bsontype.js
   - jstests/core/json_schema/misc_validation.js
-  - jstests/core/list_collections1.js
-  - jstests/core/list_collections_filter.js
-  - jstests/core/list_databases.js
-  - jstests/core/list_databases.js
-  - jstests/core/list_namespaces_invalidation.js
-  - jstests/core/list_sessions.js
-  - jstests/core/min_max_key.js
-  - jstests/core/mod.js
-  - jstests/core/mod_with_where.js
-  - jstests/core/mod_overflow.js
-  - jstests/core/mr_correctness.js
-  - jstests/core/mr_merge.js
-  - jstests/core/mr_multikey_deduping.js
-  - jstests/core/mr_reduce.js
-  - jstests/core/mr_sort.js
-  - jstests/core/multi.js
-  - jstests/core/multikey_geonear.js
-  - jstests/core/nan.js
-  - jstests/core/ne1.js
-  - jstests/core/ne2.js
-  - jstests/core/ne3.js
-  - jstests/core/ne_array.js
-  - jstests/core/nin.js
-  - jstests/core/nin2.js
-  - jstests/core/not1.js
-  - jstests/core/not2.js
-  - jstests/core/not3.js
-  - jstests/core/notablescan.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/objectfind.js
-  - jstests/core/opcounters_write_cmd.js
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/or1.js
-  - jstests/core/or3.js
-  - jstests/core/or5.js
-  - jstests/core/or7.js
-  - jstests/core/or7.js
-  - jstests/core/or8.js
-  - jstests/core/or9.js
-  - jstests/core/or_inexact.js
-  - jstests/core/or_inexact.js
-  - jstests/core/or_to_in.js
-  - jstests/core/ora.js
-  - jstests/core/orb.js
-  - jstests/core/orc.js
-  - jstests/core/ore.js
-  - jstests/core/orp.js
-  - jstests/core/plan_cache_clear.js
-  - jstests/core/plan_cache_shell_helpers.js
-  - jstests/core/profile1.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_agg.js
-  - jstests/core/profile_count.js
-  - jstests/core/profile_delete.js
-  - jstests/core/profile_distinct.js
-  - jstests/core/profile_find.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/profile_getmore.js
-  - jstests/core/profile_list_indexes.js
-  - jstests/core/profile_mapreduce.js
-  - jstests/core/profile_sampling.js
-  - jstests/core/profile_update.js
-  - jstests/core/proj_key1.js
-  - jstests/core/projection_meta_index_key.js
-  - jstests/core/pull2.js
-  - jstests/core/pull_remove1.js
-  - jstests/core/pullall2.js
-  - jstests/core/queryoptimizera.js
-  - jstests/core/ref2.js
-  - jstests/core/regex3.js
-  - jstests/core/regex4.js
-  - jstests/core/regex4.js
-  - jstests/core/regex5.js
-  - jstests/core/regex5.js
-  - jstests/core/regex6.js
-  - jstests/core/regex6.js
-  - jstests/core/regex7.js
-  - jstests/core/regex_limit.js
-  - jstests/core/regex_not_id.js
-  - jstests/core/regexa.js
-  - jstests/core/remove2.js
-  - jstests/core/remove3.js
-  - jstests/core/remove6.js
-  - jstests/core/remove7.js
-  - jstests/core/removea.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/rename_operator_missing_source.js
-  - jstests/core/role_management_helpers.js
-  - jstests/core/rollback_index_drop.js
-  - jstests/core/server1470.js
-  - jstests/core/server5346.js
-  - jstests/core/server50762.js
-  - jstests/core/set7.js
-  - jstests/core/single_field_hashed_index.js
-  - jstests/core/sort1.js
-  - jstests/core/sort8.js
-  - jstests/core/sort9.js
-  - jstests/core/sort_array.js
-  - jstests/core/sortc.js
-  - jstests/core/sortd.js
-  - jstests/core/sorth.js
-  - jstests/core/sortj.js
-  - jstests/core/sortk.js
-  - jstests/core/sort_with_update_between_getmores.js
-  - jstests/core/sparse_index_supports_ne_null.js
-  - jstests/core/stages_and_hash.js
-  - jstests/core/stages_collection_scan.js
-  - jstests/core/top.js
+  - jstests/core/**/list_collections1.js
+  - jstests/core/**/list_collections_filter.js
+  - jstests/core/**/list_databases.js
+  - jstests/core/**/list_databases.js
+  - jstests/core/**/list_namespaces_invalidation.js
+  - jstests/core/**/list_sessions.js
+  - jstests/core/**/min_max_key.js
+  - jstests/core/**/mod.js
+  - jstests/core/**/mod_with_where.js
+  - jstests/core/**/mod_overflow.js
+  - jstests/core/**/mr_correctness.js
+  - jstests/core/**/mr_merge.js
+  - jstests/core/**/mr_multikey_deduping.js
+  - jstests/core/**/mr_reduce.js
+  - jstests/core/**/mr_sort.js
+  - jstests/core/**/multi.js
+  - jstests/core/**/multikey_geonear.js
+  - jstests/core/**/nan.js
+  - jstests/core/**/ne1.js
+  - jstests/core/**/ne2.js
+  - jstests/core/**/ne3.js
+  - jstests/core/**/ne_array.js
+  - jstests/core/**/nin.js
+  - jstests/core/**/nin2.js
+  - jstests/core/**/not1.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/not3.js
+  - jstests/core/**/notablescan.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/objectfind.js
+  - jstests/core/**/opcounters_write_cmd.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/or5.js
+  - jstests/core/**/or7.js
+  - jstests/core/**/or7.js
+  - jstests/core/**/or8.js
+  - jstests/core/**/or9.js
+  - jstests/core/**/or_inexact.js
+  - jstests/core/**/or_inexact.js
+  - jstests/core/**/or_to_in.js
+  - jstests/core/**/ora.js
+  - jstests/core/**/orb.js
+  - jstests/core/**/orc.js
+  - jstests/core/**/ore.js
+  - jstests/core/**/orp.js
+  - jstests/core/**/plan_cache_clear.js
+  - jstests/core/**/plan_cache_shell_helpers.js
+  - jstests/core/**/profile1.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_agg.js
+  - jstests/core/**/profile_count.js
+  - jstests/core/**/profile_delete.js
+  - jstests/core/**/profile_distinct.js
+  - jstests/core/**/profile_find.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/profile_getmore.js
+  - jstests/core/**/profile_list_indexes.js
+  - jstests/core/**/profile_mapreduce.js
+  - jstests/core/**/profile_sampling.js
+  - jstests/core/**/profile_update.js
+  - jstests/core/**/proj_key1.js
+  - jstests/core/**/projection_meta_index_key.js
+  - jstests/core/**/pull2.js
+  - jstests/core/**/pull_remove1.js
+  - jstests/core/**/pullall2.js
+  - jstests/core/**/queryoptimizera.js
+  - jstests/core/**/ref2.js
+  - jstests/core/**/regex3.js
+  - jstests/core/**/regex4.js
+  - jstests/core/**/regex4.js
+  - jstests/core/**/regex5.js
+  - jstests/core/**/regex5.js
+  - jstests/core/**/regex6.js
+  - jstests/core/**/regex6.js
+  - jstests/core/**/regex7.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/regex_not_id.js
+  - jstests/core/**/regexa.js
+  - jstests/core/**/remove2.js
+  - jstests/core/**/remove3.js
+  - jstests/core/**/remove6.js
+  - jstests/core/**/remove7.js
+  - jstests/core/**/removea.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/rename_operator_missing_source.js
+  - jstests/core/**/role_management_helpers.js
+  - jstests/core/**/rollback_index_drop.js
+  - jstests/core/**/server1470.js
+  - jstests/core/**/server5346.js
+  - jstests/core/**/server50762.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/single_field_hashed_index.js
+  - jstests/core/**/sort1.js
+  - jstests/core/**/sort8.js
+  - jstests/core/**/sort9.js
+  - jstests/core/**/sort_array.js
+  - jstests/core/**/sortc.js
+  - jstests/core/**/sortd.js
+  - jstests/core/**/sorth.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sortk.js
+  - jstests/core/**/sort_with_update_between_getmores.js
+  - jstests/core/**/sparse_index_supports_ne_null.js
+  - jstests/core/**/stages_and_hash.js
+  - jstests/core/**/stages_collection_scan.js
+  - jstests/core/**/top.js
   - jstests/core/txns/abort_prepared_transaction.js
   - jstests/core/txns/aggregation_in_transaction.js
   - jstests/core/txns/commit_and_abort_large_prepared_transactions.js
@@ -409,37 +409,37 @@ selector:
   - jstests/core/txns/transactions_profiling_with_drops.js
   - jstests/core/txns/transactions_write_conflicts.js
   - jstests/core/txns/transactions_write_conflicts_unique_indexes.js
-  - jstests/core/update2.js
-  - jstests/core/update3.js
-  - jstests/core/update5.js
-  - jstests/core/update6.js
-  - jstests/core/update7.js
-  - jstests/core/update8.js
-  - jstests/core/update9.js
-  - jstests/core/update_affects_indexes.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_arraymatch1.js
-  - jstests/core/update_arraymatch2.js
-  - jstests/core/update_arraymatch3.js
-  - jstests/core/update_arraymatch7.js
-  - jstests/core/update_invalid1.js
-  - jstests/core/update_metrics.js
-  - jstests/core/update_setOnInsert.js
-  - jstests/core/update_with_pipeline.js
-  - jstests/core/updatea.js
-  - jstests/core/updateb.js
-  - jstests/core/updated.js
-  - jstests/core/updateg.js
-  - jstests/core/updateh.js
-  - jstests/core/updatel.js
-  - jstests/core/updatel.js
-  - jstests/core/updatem.js
-  - jstests/core/upsert_and.js
-  - jstests/core/upsert_fields.js
-  - jstests/core/upsert_shell.js
-  - jstests/core/useindexonobjgtlt.js
-  - jstests/core/user_management_helpers.js
-  - jstests/core/verify_update_mods.js
+  - jstests/core/**/update2.js
+  - jstests/core/**/update3.js
+  - jstests/core/**/update5.js
+  - jstests/core/**/update6.js
+  - jstests/core/**/update7.js
+  - jstests/core/**/update8.js
+  - jstests/core/**/update9.js
+  - jstests/core/**/update_affects_indexes.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_arraymatch1.js
+  - jstests/core/**/update_arraymatch2.js
+  - jstests/core/**/update_arraymatch3.js
+  - jstests/core/**/update_arraymatch7.js
+  - jstests/core/**/update_invalid1.js
+  - jstests/core/**/update_metrics.js
+  - jstests/core/**/update_setOnInsert.js
+  - jstests/core/**/update_with_pipeline.js
+  - jstests/core/**/updatea.js
+  - jstests/core/**/updateb.js
+  - jstests/core/**/updated.js
+  - jstests/core/**/updateg.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/updatem.js
+  - jstests/core/**/upsert_and.js
+  - jstests/core/**/upsert_fields.js
+  - jstests/core/**/upsert_shell.js
+  - jstests/core/**/useindexonobjgtlt.js
+  - jstests/core/**/user_management_helpers.js
+  - jstests/core/**/verify_update_mods.js
   - jstests/core/views/views_aggregation.js
   - jstests/core/views/invalid_system_views.js
   - jstests/core/views/views_all_commands.js
@@ -449,333 +449,333 @@ selector:
   - jstests/core/views/views_count.js
   - jstests/core/views/views_distinct.js
   - jstests/core/views/views_validation.js
-  - jstests/core/where_system_js.js
-  - jstests/core/wildcard_and_text_indexes.js
-  - jstests/core/wildcard_index_basic_index_bounds.js
-  - jstests/core/wildcard_index_cached_plans.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/wildcard_index_covered_queries.js
-  - jstests/core/wildcard_index_distinct_scan.js
-  - jstests/core/wildcard_index_empty_arrays.js
-  - jstests/core/wildcard_index_equality_to_empty_obj.js
-  - jstests/core/wildcard_index_multikey.js
-  - jstests/core/wildcard_index_nonblocking_sort.js
-  - jstests/core/wildcard_index_partial_index.js
-  - jstests/core/wildcard_index_validindex.js
-  - jstests/core/write_commands_reject_unknown_fields.js
-  - jstests/core/write_result.js
+  - jstests/core/**/where_system_js.js
+  - jstests/core/**/wildcard_and_text_indexes.js
+  - jstests/core/**/wildcard_index_basic_index_bounds.js
+  - jstests/core/**/wildcard_index_cached_plans.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/wildcard_index_covered_queries.js
+  - jstests/core/**/wildcard_index_distinct_scan.js
+  - jstests/core/**/wildcard_index_empty_arrays.js
+  - jstests/core/**/wildcard_index_equality_to_empty_obj.js
+  - jstests/core/**/wildcard_index_multikey.js
+  - jstests/core/**/wildcard_index_nonblocking_sort.js
+  - jstests/core/**/wildcard_index_partial_index.js
+  - jstests/core/**/wildcard_index_validindex.js
+  - jstests/core/**/write_commands_reject_unknown_fields.js
+  - jstests/core/**/write_result.js
 
   # TODO SERVER-48853 Enable tests with array operators.
-  - jstests/core/all.js
-  - jstests/core/all2.js
-  - jstests/core/all3.js
-  - jstests/core/all4.js
-  - jstests/core/all4.js
-  - jstests/core/all5.js
-  - jstests/core/all5.js
-  - jstests/core/always_true_false.js
-  - jstests/core/arrayfind1.js
-  - jstests/core/arrayfind2.js
-  - jstests/core/arrayfind2.js
-  - jstests/core/arrayfind3.js
-  - jstests/core/arrayfind5.js
-  - jstests/core/arrayfind6.js
-  - jstests/core/arrayfind7.js
-  - jstests/core/arrayfind8.js
-  - jstests/core/arrayfind9.js
-  - jstests/core/arrayfinda.js
-  - jstests/core/arrayfindb.js
-  - jstests/core/dbref2.js
-  - jstests/core/dbref3.js
-  - jstests/core/elemmatch_object.js
-  - jstests/core/elemmatch_or_pushdown.js
-  - jstests/core/elemmatch_value.js
-  - jstests/core/elemmatch_projection.js
-  - jstests/core/positional_projection.js
-  - jstests/core/existsa.js
-  - jstests/core/expr.js
-  - jstests/core/expr_valid_positions.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/find_size.js
-  - jstests/core/fts_trailing_fields.js
-  - jstests/core/geo_2d_trailing_fields.js
-  - jstests/core/idhack.js
-  - jstests/core/in7.js
-  - jstests/core/index13.js
-  - jstests/core/index_check2.js
-  - jstests/core/indexl.js
+  - jstests/core/**/all.js
+  - jstests/core/**/all2.js
+  - jstests/core/**/all3.js
+  - jstests/core/**/all4.js
+  - jstests/core/**/all4.js
+  - jstests/core/**/all5.js
+  - jstests/core/**/all5.js
+  - jstests/core/**/always_true_false.js
+  - jstests/core/**/arrayfind1.js
+  - jstests/core/**/arrayfind2.js
+  - jstests/core/**/arrayfind2.js
+  - jstests/core/**/arrayfind3.js
+  - jstests/core/**/arrayfind5.js
+  - jstests/core/**/arrayfind6.js
+  - jstests/core/**/arrayfind7.js
+  - jstests/core/**/arrayfind8.js
+  - jstests/core/**/arrayfind9.js
+  - jstests/core/**/arrayfinda.js
+  - jstests/core/**/arrayfindb.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/dbref3.js
+  - jstests/core/**/elemmatch_object.js
+  - jstests/core/**/elemmatch_or_pushdown.js
+  - jstests/core/**/elemmatch_value.js
+  - jstests/core/**/elemmatch_projection.js
+  - jstests/core/**/positional_projection.js
+  - jstests/core/**/existsa.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/expr_valid_positions.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/find_size.js
+  - jstests/core/**/fts_trailing_fields.js
+  - jstests/core/**/geo_2d_trailing_fields.js
+  - jstests/core/**/idhack.js
+  - jstests/core/**/in7.js
+  - jstests/core/**/index13.js
+  - jstests/core/**/index_check2.js
+  - jstests/core/**/indexl.js
   - jstests/core/json_schema/misc_validation.js
-  - jstests/core/ne_array.js
-  - jstests/core/nin.js
-  - jstests/core/not2.js
-  - jstests/core/not2.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or5.js
-  - jstests/core/or_inexact.js
-  - jstests/core/positional_projection_multiple_array_fields.js
-  - jstests/core/regex.js
-  - jstests/core/regex5.js
-  - jstests/core/sparse_index_supports_ne_null.js
-  - jstests/core/update_arraymatch5.js
-  - jstests/core/upsert_fields.js
-  - jstests/core/upsert_fields.js
+  - jstests/core/**/ne_array.js
+  - jstests/core/**/nin.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or5.js
+  - jstests/core/**/or_inexact.js
+  - jstests/core/**/positional_projection_multiple_array_fields.js
+  - jstests/core/**/regex.js
+  - jstests/core/**/regex5.js
+  - jstests/core/**/sparse_index_supports_ne_null.js
+  - jstests/core/**/update_arraymatch5.js
+  - jstests/core/**/upsert_fields.js
+  - jstests/core/**/upsert_fields.js
   - jstests/core/views/views_find.js
-  - jstests/core/where1.js
-  - jstests/core/wildcard_index_covered_queries.js
-  - jstests/core/wildcard_index_multikey.js
-  - jstests/core/wildcard_index_nonblocking_sort.js
+  - jstests/core/**/where1.js
+  - jstests/core/**/wildcard_index_covered_queries.js
+  - jstests/core/**/wildcard_index_multikey.js
+  - jstests/core/**/wildcard_index_nonblocking_sort.js
 
   # TODO SERVER-48851 Enable tests with evaluation operators.
-  - jstests/core/and.js
-  - jstests/core/and3.js
-  - jstests/core/arrayfind8.js
-  - jstests/core/collation.js
-  - jstests/core/command_let_variables.js
-  - jstests/core/constructors.js
-  - jstests/core/count.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/counta.js
-  - jstests/core/countb.js
-  - jstests/core/countc.js
-  - jstests/core/cursora.js
-  - jstests/core/depth_limit.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_invalid_validators.js
-  - jstests/core/elemmatch_projection.js
-  - jstests/core/positional_projection.js
-  - jstests/core/explain_sort_type.js
-  - jstests/core/expr.js
-  - jstests/core/expr_index_use.js
-  - jstests/core/expr_or_pushdown.js
-  - jstests/core/expr_valid_positions.js
-  - jstests/core/find6.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/find_and_modify_where.js
-  - jstests/core/fts1.js
-  - jstests/core/fts2.js
-  - jstests/core/fts3.js
-  - jstests/core/fts4.js
-  - jstests/core/fts5.js
-  - jstests/core/fts6.js
-  - jstests/core/fts_array.js
-  - jstests/core/fts_blog.js
-  - jstests/core/fts_blogwild.js
-  - jstests/core/fts_casesensitive.js
-  - jstests/core/fts_diacritic_and_caseinsensitive.js
-  - jstests/core/fts_diacritic_and_casesensitive.js
-  - jstests/core/fts_diacriticsensitive.js
-  - jstests/core/fts_dotted_prefix_fields.js
-  - jstests/core/fts_explain.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/fts_index.js
-  - jstests/core/fts_index2.js
-  - jstests/core/fts_index3.js
-  - jstests/core/fts_index_version1.js
-  - jstests/core/fts_index_version2.js
-  - jstests/core/fts_index_wildcard_and_weight.js
-  - jstests/core/fts_mix.js
-  - jstests/core/fts_partition1.js
-  - jstests/core/fts_phrase.js
-  - jstests/core/fts_proj.js
-  - jstests/core/fts_projection.js
-  - jstests/core/fts_querylang.js
-  - jstests/core/fts_score_sort.js
-  - jstests/core/fts_spanish.js
-  - jstests/core/fts_trailing_fields.js
-  - jstests/core/function_string_representations.js
-  - jstests/core/getlog2.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/hidden_index.js
-  - jstests/core/index_filter_commands.js
-  - jstests/core/index_partial_create_drop.js
-  - jstests/core/js1.js
-  - jstests/core/js2.js
-  - jstests/core/js3.js
-  - jstests/core/js4.js
-  - jstests/core/js5.js
-  - jstests/core/js8.js
-  - jstests/core/json1.js
+  - jstests/core/**/and.js
+  - jstests/core/**/and3.js
+  - jstests/core/**/arrayfind8.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/command_let_variables.js
+  - jstests/core/**/constructors.js
+  - jstests/core/**/count.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/counta.js
+  - jstests/core/**/countb.js
+  - jstests/core/**/countc.js
+  - jstests/core/**/cursora.js
+  - jstests/core/**/depth_limit.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_invalid_validators.js
+  - jstests/core/**/elemmatch_projection.js
+  - jstests/core/**/positional_projection.js
+  - jstests/core/**/explain_sort_type.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/expr_or_pushdown.js
+  - jstests/core/**/expr_valid_positions.js
+  - jstests/core/**/find6.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/find_and_modify_where.js
+  - jstests/core/**/fts1.js
+  - jstests/core/**/fts2.js
+  - jstests/core/**/fts3.js
+  - jstests/core/**/fts4.js
+  - jstests/core/**/fts5.js
+  - jstests/core/**/fts6.js
+  - jstests/core/**/fts_array.js
+  - jstests/core/**/fts_blog.js
+  - jstests/core/**/fts_blogwild.js
+  - jstests/core/**/fts_casesensitive.js
+  - jstests/core/**/fts_diacritic_and_caseinsensitive.js
+  - jstests/core/**/fts_diacritic_and_casesensitive.js
+  - jstests/core/**/fts_diacriticsensitive.js
+  - jstests/core/**/fts_dotted_prefix_fields.js
+  - jstests/core/**/fts_explain.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/fts_index.js
+  - jstests/core/**/fts_index2.js
+  - jstests/core/**/fts_index3.js
+  - jstests/core/**/fts_index_version1.js
+  - jstests/core/**/fts_index_version2.js
+  - jstests/core/**/fts_index_wildcard_and_weight.js
+  - jstests/core/**/fts_mix.js
+  - jstests/core/**/fts_partition1.js
+  - jstests/core/**/fts_phrase.js
+  - jstests/core/**/fts_proj.js
+  - jstests/core/**/fts_projection.js
+  - jstests/core/**/fts_querylang.js
+  - jstests/core/**/fts_score_sort.js
+  - jstests/core/**/fts_spanish.js
+  - jstests/core/**/fts_trailing_fields.js
+  - jstests/core/**/function_string_representations.js
+  - jstests/core/**/getlog2.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/hidden_index.js
+  - jstests/core/**/index_filter_commands.js
+  - jstests/core/**/index_partial_create_drop.js
+  - jstests/core/**/js1.js
+  - jstests/core/**/js2.js
+  - jstests/core/**/js3.js
+  - jstests/core/**/js4.js
+  - jstests/core/**/js5.js
+  - jstests/core/**/js8.js
+  - jstests/core/**/json1.js
   - jstests/core/json_schema/misc_validation.js
-  - jstests/core/list_collections_filter.js
-  - jstests/core/list_databases.js
-  - jstests/core/list_namespaces_invalidation.js
-  - jstests/core/mod.js
-  - jstests/core/mod_with_where.js
-  - jstests/core/mod_overflow.js
-  - jstests/core/not2.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/or_inexact.js
-  - jstests/core/ora.js
-  - jstests/core/plan_cache_clear.js
-  - jstests/core/plan_cache_list_shapes.js
-  - jstests/core/profile_delete.js
-  - jstests/core/regex.js
-  - jstests/core/regex2.js
-  - jstests/core/regex6.js
-  - jstests/core/regex8.js
-  - jstests/core/regex9.js
-  - jstests/core/regex_embed1.js
-  - jstests/core/regex_error.js
-  - jstests/core/regex_limit.js
-  - jstests/core/regex_options.js
-  - jstests/core/regex_unicode.js
-  - jstests/core/regex_verbs.js
-  - jstests/core/regexb.js
-  - jstests/core/regexc.js
-  - jstests/core/server7756.js
-  - jstests/core/sortk.js
-  - jstests/core/system_js_access.js
-  - jstests/core/text_covered_matching.js
+  - jstests/core/**/list_collections_filter.js
+  - jstests/core/**/list_databases.js
+  - jstests/core/**/list_namespaces_invalidation.js
+  - jstests/core/**/mod.js
+  - jstests/core/**/mod_with_where.js
+  - jstests/core/**/mod_overflow.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/or_inexact.js
+  - jstests/core/**/ora.js
+  - jstests/core/**/plan_cache_clear.js
+  - jstests/core/**/plan_cache_list_shapes.js
+  - jstests/core/**/profile_delete.js
+  - jstests/core/**/regex.js
+  - jstests/core/**/regex2.js
+  - jstests/core/**/regex6.js
+  - jstests/core/**/regex8.js
+  - jstests/core/**/regex9.js
+  - jstests/core/**/regex_embed1.js
+  - jstests/core/**/regex_error.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/regex_options.js
+  - jstests/core/**/regex_unicode.js
+  - jstests/core/**/regex_verbs.js
+  - jstests/core/**/regexb.js
+  - jstests/core/**/regexc.js
+  - jstests/core/**/server7756.js
+  - jstests/core/**/sortk.js
+  - jstests/core/**/system_js_access.js
+  - jstests/core/**/text_covered_matching.js
   - jstests/core/txns/transactions_profiling_with_drops.js
-  - jstests/core/type1.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/upsert_shell.js
-  - jstests/core/where1.js
-  - jstests/core/where2.js
-  - jstests/core/where3.js
-  - jstests/core/where5.js
-  - jstests/core/where_system_js.js
-  - jstests/core/where_tolerates_js_exception.js
-  - jstests/core/wildcard_and_text_indexes.js
+  - jstests/core/**/type1.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/upsert_shell.js
+  - jstests/core/**/where1.js
+  - jstests/core/**/where2.js
+  - jstests/core/**/where3.js
+  - jstests/core/**/where5.js
+  - jstests/core/**/where_system_js.js
+  - jstests/core/**/where_tolerates_js_exception.js
+  - jstests/core/**/wildcard_and_text_indexes.js
 
   # TODO SERVER-48852: Implement geo operators.
-  - jstests/core/collation.js
-  - jstests/core/doc_validation_invalid_validators.js
-  - jstests/core/expr.js
-  - jstests/core/geo1.js
-  - jstests/core/geo10.js
-  - jstests/core/geo2.js
-  - jstests/core/geo3.js
-  - jstests/core/geo6.js
-  - jstests/core/geo7.js
-  - jstests/core/geo9.js
-  - jstests/core/geo_2d_explain.js
-  - jstests/core/geo_2d_trailing_fields.js
-  - jstests/core/geo_2d_with_geojson_point.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_array0.js
-  - jstests/core/geo_array2.js
-  - jstests/core/geo_big_polygon.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geo_big_polygon3.js
-  - jstests/core/geo_borders.js
-  - jstests/core/geo_box1.js
-  - jstests/core/geo_box1_noindex.js
-  - jstests/core/geo_box2.js
-  - jstests/core/geo_box3.js
-  - jstests/core/geo_center_sphere1.js
-  - jstests/core/geo_center_sphere2.js
-  - jstests/core/geo_circle1.js
-  - jstests/core/geo_circle1_noindex.js
-  - jstests/core/geo_circle2.js
-  - jstests/core/geo_circle2a.js
-  - jstests/core/geo_circle3.js
-  - jstests/core/geo_circle4.js
-  - jstests/core/geo_circle5.js
-  - jstests/core/geo_distinct.js
-  - jstests/core/geo_exactfetch.js
-  - jstests/core/geo_fiddly_box.js
-  - jstests/core/geo_fiddly_box2.js
-  - jstests/core/geo_max.js
-  - jstests/core/geo_mindistance.js
-  - jstests/core/geo_mindistance_boundaries.js
-  - jstests/core/geo_multinest0.js
-  - jstests/core/geo_multinest1.js
-  - jstests/core/geo_near_point_query.js
-  - jstests/core/geo_near_random1.js
-  - jstests/core/geo_near_random2.js
-  - jstests/core/geo_near_tailable.js
-  - jstests/core/geo_nearwithin.js
-  - jstests/core/geo_oob_sphere.js
-  - jstests/core/geo_operator_crs.js
-  - jstests/core/geo_or.js
-  - jstests/core/geo_poly_edge.js
-  - jstests/core/geo_poly_line.js
-  - jstests/core/geo_polygon1.js
-  - jstests/core/geo_polygon1_noindex.js
-  - jstests/core/geo_polygon2.js
-  - jstests/core/geo_polygon3.js
-  - jstests/core/geo_queryoptimizer.js
-  - jstests/core/geo_regex0.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/geo_s2dedupnear.js
-  - jstests/core/geo_s2descindex.js
-  - jstests/core/geo_s2disjoint_holes.js
-  - jstests/core/geo_s2dupe_points.js
-  - jstests/core/geo_s2edgecases.js
-  - jstests/core/geo_s2exact.js
-  - jstests/core/geo_s2explain.js
-  - jstests/core/geo_s2holesameasshell.js
-  - jstests/core/geo_s2index.js
-  - jstests/core/geo_s2indexoldformat.js
-  - jstests/core/geo_s2intersection.js
-  - jstests/core/geo_s2largewithin.js
-  - jstests/core/geo_s2meridian.js
-  - jstests/core/geo_s2multi.js
-  - jstests/core/geo_s2near.js
-  - jstests/core/geo_s2near_equator_opposite.js
-  - jstests/core/geo_s2nearComplex.js
-  - jstests/core/geo_s2nearcorrect.js
-  - jstests/core/geo_s2nearwithin.js
-  - jstests/core/geo_s2nongeoarray.js
-  - jstests/core/geo_s2nonstring.js
-  - jstests/core/geo_s2nopoints.js
-  - jstests/core/geo_s2oddshapes.js
-  - jstests/core/geo_s2ordering.js
-  - jstests/core/geo_s2overlappingpolys.js
-  - jstests/core/geo_s2polywithholes.js
-  - jstests/core/geo_s2twofields.js
-  - jstests/core/geo_s2within.js
-  - jstests/core/geo_s2within_line_polygon_sphere.js
-  - jstests/core/geo_small_large.js
-  - jstests/core/geo_sort1.js
-  - jstests/core/geo_uniqueDocs.js
-  - jstests/core/geo_uniqueDocs2.js
-  - jstests/core/geo_update.js
-  - jstests/core/geo_update1.js
-  - jstests/core/geo_update2.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/geo_update_btree2.js
-  - jstests/core/geo_update_dedup.js
-  - jstests/core/geo_validate.js
-  - jstests/core/geo_withinquery.js
-  - jstests/core/geoa.js
-  - jstests/core/geob.js
-  - jstests/core/geoc.js
-  - jstests/core/geod.js
-  - jstests/core/geoe.js
-  - jstests/core/geof.js
-  - jstests/core/geonear_cmd_input_validation.js
-  - jstests/core/geonear_key.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/hidden_index.js
-  - jstests/core/index_partial_2dsphere.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/doc_validation_invalid_validators.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/geo1.js
+  - jstests/core/**/geo10.js
+  - jstests/core/**/geo2.js
+  - jstests/core/**/geo3.js
+  - jstests/core/**/geo6.js
+  - jstests/core/**/geo7.js
+  - jstests/core/**/geo9.js
+  - jstests/core/**/geo_2d_explain.js
+  - jstests/core/**/geo_2d_trailing_fields.js
+  - jstests/core/**/geo_2d_with_geojson_point.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_array0.js
+  - jstests/core/**/geo_array2.js
+  - jstests/core/**/geo_big_polygon.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geo_big_polygon3.js
+  - jstests/core/**/geo_borders.js
+  - jstests/core/**/geo_box1.js
+  - jstests/core/**/geo_box1_noindex.js
+  - jstests/core/**/geo_box2.js
+  - jstests/core/**/geo_box3.js
+  - jstests/core/**/geo_center_sphere1.js
+  - jstests/core/**/geo_center_sphere2.js
+  - jstests/core/**/geo_circle1.js
+  - jstests/core/**/geo_circle1_noindex.js
+  - jstests/core/**/geo_circle2.js
+  - jstests/core/**/geo_circle2a.js
+  - jstests/core/**/geo_circle3.js
+  - jstests/core/**/geo_circle4.js
+  - jstests/core/**/geo_circle5.js
+  - jstests/core/**/geo_distinct.js
+  - jstests/core/**/geo_exactfetch.js
+  - jstests/core/**/geo_fiddly_box.js
+  - jstests/core/**/geo_fiddly_box2.js
+  - jstests/core/**/geo_max.js
+  - jstests/core/**/geo_mindistance.js
+  - jstests/core/**/geo_mindistance_boundaries.js
+  - jstests/core/**/geo_multinest0.js
+  - jstests/core/**/geo_multinest1.js
+  - jstests/core/**/geo_near_point_query.js
+  - jstests/core/**/geo_near_random1.js
+  - jstests/core/**/geo_near_random2.js
+  - jstests/core/**/geo_near_tailable.js
+  - jstests/core/**/geo_nearwithin.js
+  - jstests/core/**/geo_oob_sphere.js
+  - jstests/core/**/geo_operator_crs.js
+  - jstests/core/**/geo_or.js
+  - jstests/core/**/geo_poly_edge.js
+  - jstests/core/**/geo_poly_line.js
+  - jstests/core/**/geo_polygon1.js
+  - jstests/core/**/geo_polygon1_noindex.js
+  - jstests/core/**/geo_polygon2.js
+  - jstests/core/**/geo_polygon3.js
+  - jstests/core/**/geo_queryoptimizer.js
+  - jstests/core/**/geo_regex0.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/geo_s2dedupnear.js
+  - jstests/core/**/geo_s2descindex.js
+  - jstests/core/**/geo_s2disjoint_holes.js
+  - jstests/core/**/geo_s2dupe_points.js
+  - jstests/core/**/geo_s2edgecases.js
+  - jstests/core/**/geo_s2exact.js
+  - jstests/core/**/geo_s2explain.js
+  - jstests/core/**/geo_s2holesameasshell.js
+  - jstests/core/**/geo_s2index.js
+  - jstests/core/**/geo_s2indexoldformat.js
+  - jstests/core/**/geo_s2intersection.js
+  - jstests/core/**/geo_s2largewithin.js
+  - jstests/core/**/geo_s2meridian.js
+  - jstests/core/**/geo_s2multi.js
+  - jstests/core/**/geo_s2near.js
+  - jstests/core/**/geo_s2near_equator_opposite.js
+  - jstests/core/**/geo_s2nearComplex.js
+  - jstests/core/**/geo_s2nearcorrect.js
+  - jstests/core/**/geo_s2nearwithin.js
+  - jstests/core/**/geo_s2nongeoarray.js
+  - jstests/core/**/geo_s2nonstring.js
+  - jstests/core/**/geo_s2nopoints.js
+  - jstests/core/**/geo_s2oddshapes.js
+  - jstests/core/**/geo_s2ordering.js
+  - jstests/core/**/geo_s2overlappingpolys.js
+  - jstests/core/**/geo_s2polywithholes.js
+  - jstests/core/**/geo_s2twofields.js
+  - jstests/core/**/geo_s2within.js
+  - jstests/core/**/geo_s2within_line_polygon_sphere.js
+  - jstests/core/**/geo_small_large.js
+  - jstests/core/**/geo_sort1.js
+  - jstests/core/**/geo_uniqueDocs.js
+  - jstests/core/**/geo_uniqueDocs2.js
+  - jstests/core/**/geo_update.js
+  - jstests/core/**/geo_update1.js
+  - jstests/core/**/geo_update2.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/geo_update_btree2.js
+  - jstests/core/**/geo_update_dedup.js
+  - jstests/core/**/geo_validate.js
+  - jstests/core/**/geo_withinquery.js
+  - jstests/core/**/geoa.js
+  - jstests/core/**/geob.js
+  - jstests/core/**/geoc.js
+  - jstests/core/**/geod.js
+  - jstests/core/**/geoe.js
+  - jstests/core/**/geof.js
+  - jstests/core/**/geonear_cmd_input_validation.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/hidden_index.js
+  - jstests/core/**/index_partial_2dsphere.js
   - jstests/core/json_schema/misc_validation.js
-  - jstests/core/list_collections_filter.js
-  - jstests/core/list_databases.js
-  - jstests/core/multikey_geonear.js
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/or5.js
-  - jstests/core/or_inexact.js
-  - jstests/core/ora.js
-  - jstests/core/update_arrayFilters.js
+  - jstests/core/**/list_collections_filter.js
+  - jstests/core/**/list_databases.js
+  - jstests/core/**/multikey_geonear.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/or5.js
+  - jstests/core/**/or_inexact.js
+  - jstests/core/**/ora.js
+  - jstests/core/**/update_arrayFilters.js
 
   # TODO SERVER-48854 Implement bitwise ops.
-  - jstests/core/bittest.js
+  - jstests/core/**/bittest.js
 
   # TODO SERVER-51224 Support dotted-path fieldnames in find filters
-  - jstests/core/hashed_index_collation.js
-  - jstests/core/wildcard_index_dedup.js
-  - jstests/core/array_match2.js
-  - jstests/core/dbref4.js
-  - jstests/core/exists5.js
-  - jstests/core/comment_field.js
-  - jstests/core/wildcard_index_type.js
-  - jstests/core/type_array.js
-  - jstests/core/exists9.js
-  - jstests/core/exists8.js
+  - jstests/core/**/hashed_index_collation.js
+  - jstests/core/**/wildcard_index_dedup.js
+  - jstests/core/**/array_match2.js
+  - jstests/core/**/dbref4.js
+  - jstests/core/**/exists5.js
+  - jstests/core/**/comment_field.js
+  - jstests/core/**/wildcard_index_type.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/exists9.js
+  - jstests/core/**/exists8.js
 
   # TODO SERVER-54042 Time-series collection queries
   - jstests/core/timeseries/timeseries_bucket_limit_count.js
diff --git a/buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml
index 3727d649dab..a75f65281ea 100644
--- a/buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml
@@ -12,8 +12,8 @@ selector:
   # Transactions only a readConcern argument on the first command.
   - jstests/core/txns/**/*.js
   # These tests use benchRun(), which isn't configured to use the overridden writeConcern.
-  - jstests/core/bench_test*.js
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/bench_test*.js
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
   exclude_with_any_tags:
   - assumes_standalone_mongod
   ##
diff --git a/buildscripts/resmokeconfig/suites/cwrwc_wc_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/cwrwc_wc_majority_passthrough.yml
index 8c6e0f384ed..5941432e45f 100644
--- a/buildscripts/resmokeconfig/suites/cwrwc_wc_majority_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/cwrwc_wc_majority_passthrough.yml
@@ -11,7 +11,7 @@ selector:
   - jstests/core/txns/**/*.js
   # The shellkillop.js test spawns a parallel shell without using startParallelShell() and therefore
   # doesn't inherit the w="majority" write concern when performing its writes.
-  - jstests/core/shellkillop.js
+  - jstests/core/**/shellkillop.js
   exclude_with_any_tags:
   ##
   # The next three tags correspond to the special errors thrown by the
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml
index 3f6bd711010..02b9116d197 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml
@@ -9,21 +9,21 @@ selector:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
   # server parameter.
-  - jstests/core/set_param1.js
+  - jstests/core/**/set_param1.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal
   # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same
   # time, the logical session cache refresh thread will flush these sessions to disk, creating more
   # opLog entries. To avoid this infinite loop, we will denylist the test from this suite.
-  - jstests/core/awaitdata_getmore_cmd.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml
index 81d50f8759d..1cb8d42ce2d 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml
@@ -9,21 +9,21 @@ selector:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
   # server parameter.
-  - jstests/core/set_param1.js
+  - jstests/core/**/set_param1.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal
   # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same
   # time, the logical session cache refresh thread will flush these sessions to disk, creating more
   # opLog entries. To avoid this infinite loop, we will denylist the test from this suite.
-  - jstests/core/awaitdata_getmore_cmd.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml
index c845864d81a..95e276ed112 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml
@@ -9,21 +9,21 @@ selector:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
   # server parameter.
-  - jstests/core/set_param1.js
+  - jstests/core/**/set_param1.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal
   # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same
   # time, the logical session cache refresh thread will flush these sessions to disk, creating more
   # opLog entries. To avoid this infinite loop, we will denylist the test from this suite.
-  - jstests/core/awaitdata_getmore_cmd.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml
index 0899cfd0b1b..a8434414a22 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml
@@ -9,21 +9,21 @@ selector:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
   # server parameter.
-  - jstests/core/set_param1.js
+  - jstests/core/**/set_param1.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal
   # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same
   # time, the logical session cache refresh thread will flush these sessions to disk, creating more
   # opLog entries. To prevent this infinite loop, we will denylist the test from this suite.
-  - jstests/core/awaitdata_getmore_cmd.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
index 36e0650679a..1dd63c68dd2 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
@@ -10,71 +10,71 @@ selector:
   - jstests/core/txns/**/*.js
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
index 46410b28097..8ac8e076409 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
@@ -10,71 +10,71 @@ selector:
   - jstests/core/txns/**/*.js
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
index 6f03be22189..c3482497c65 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
@@ -10,71 +10,71 @@ selector:
   - jstests/core/txns/**/*.js
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
index cfbc836c8a7..148b7d0bd03 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
@@ -10,71 +10,71 @@ selector:
   - jstests/core/txns/**/*.js
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_100ms_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_100ms_refresh_jscore_passthrough.yml
index dae009af297..2b61effb3a1 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_100ms_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_100ms_refresh_jscore_passthrough.yml
@@ -8,16 +8,16 @@ selector:
   - jstests/core/txns/**/*.js
   # This test expects a fixed number of operations. The logical session cache will perform its own
   # operations, inflating the number of operations and causing the test to fail.
-  - jstests/core/opcounters_write_cmd.js
+  - jstests/core/**/opcounters_write_cmd.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_10sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_10sec_refresh_jscore_passthrough.yml
index 182b59965a1..4d3ef6b2701 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_10sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_10sec_refresh_jscore_passthrough.yml
@@ -8,16 +8,16 @@ selector:
   - jstests/core/txns/**/*.js
   # This test expects a fixed number of operations. The logical session cache will perform its own
   # operations, inflating the number of operations and causing the test to fail.
-  - jstests/core/opcounters_write_cmd.js
+  - jstests/core/**/opcounters_write_cmd.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_1sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_1sec_refresh_jscore_passthrough.yml
index 8b4db08b8bf..fa7b9c13daa 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_1sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_1sec_refresh_jscore_passthrough.yml
@@ -8,16 +8,16 @@ selector:
   - jstests/core/txns/**/*.js
   # This test expects a fixed number of operations. The logical session cache will perform its own
   # operations, inflating the number of operations and causing the test to fail.
-  - jstests/core/opcounters_write_cmd.js
+  - jstests/core/**/opcounters_write_cmd.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_default_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_default_refresh_jscore_passthrough.yml
index 62886996b51..5f91f3b17f3 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_default_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_standalone_default_refresh_jscore_passthrough.yml
@@ -8,16 +8,16 @@ selector:
   - jstests/core/txns/**/*.js
   # This test expects a fixed number of operations. The logical session cache will perform its own
   # operations, inflating the number of operations and causing the test to fail.
-  - jstests/core/opcounters_write_cmd.js
+  - jstests/core/**/opcounters_write_cmd.js
   # These tests expect the logical session cache refresh thread to be turned off, so that refreshes
   # can be triggered deterministically.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
index 4f42069d595..ecde75f86be 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
@@ -9,240 +9,240 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
 
   ##
   ## Limitations with the way the runner file injects transactions.
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/and.js
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/and.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # TODO: SERVER-38207 Cannot insert document with MaxKey shard key.
-  - jstests/core/type8.js
+  - jstests/core/**/type8.js
 
   ##
   ## Some aggregation stages aren't allowed in a transaction.
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Misc. reasons.
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed in a transaction.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
   - jstests/core/json_schema/misc_validation.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/cursora.js
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   # "Cowardly refusing to override read concern of command: ..."
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
index 6984ff537c2..215fb7d9107 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
@@ -9,125 +9,125 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
 
   ##
   ## Limitations with the way the runner file injects transactions.
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # TODO: SERVER-38207 Cannot insert document with MaxKey shard key.
-  - jstests/core/type8.js
+  - jstests/core/**/type8.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -137,54 +137,54 @@ selector:
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/explain_server_params.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/explain_server_params.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
+  - jstests/core/**/wildcard_index_count.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -198,19 +198,19 @@ selector:
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -218,53 +218,53 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   # "Cowardly refusing to override read concern of command: ..."
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index 97fe5c77d1d..4c317b0ab94 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -9,196 +9,196 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
 
   ##
   ## Limitations with the way the runner file injects transactions.
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # TODO: SERVER-38207 Cannot insert document with MaxKey shard key.
-  - jstests/core/type8.js
+  - jstests/core/**/type8.js
 
   ##
   ## Some aggregation stages don't support snapshot readconcern.
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Misc. reasons.
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -206,66 +206,66 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # dropDatabase is not resilient to stepdowns on sharded cluster
-  - jstests/core/dropdb.js
-  - jstests/core/validate_db_metadata_command.js
+  - jstests/core/**/dropdb.js
+  - jstests/core/**/validate_db_metadata_command.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # auto_retry_on_network_error.js will timeout with assert.soon and give a different error from
   # what test expects. Excluding from suite since it doesn't really do any database operations, so
   # it doesn't provide value here.
-  - jstests/core/connection_string_validation.js
+  - jstests/core/**/connection_string_validation.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # Examines _id of upserted document.
-  - jstests/core/find_and_modify_server7660.js
-  - jstests/core/upsert_shell.js
+  - jstests/core/**/find_and_modify_server7660.js
+  - jstests/core/**/upsert_shell.js
 
   # "assert: [197] != [[ 6868501 ]] are not equal"
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   ##
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
index 00b25e7c6fe..455e9aa6ab3 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
@@ -9,197 +9,197 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
 
   ##
   ## Limitations with the way the runner file injects transactions.
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # TODO: SERVER-38207 Cannot insert document with MaxKey shard key.
-  - jstests/core/type8.js
+  - jstests/core/**/type8.js
 
   ##
   ## Some aggregation stages don't support snapshot readconcern.
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Misc. reasons.
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -207,65 +207,65 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # dropDatabase is not resilient to stepdowns on sharded cluster
-  - jstests/core/validate_db_metadata_command.js
+  - jstests/core/**/validate_db_metadata_command.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # auto_retry_on_network_error.js will timeout with assert.soon and give a different error from
   # what test expects. Excluding from suite since it doesn't really do any database operations, so
   # it doesn't provide value here.
-  - jstests/core/connection_string_validation.js
+  - jstests/core/**/connection_string_validation.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # Examines _id of upserted document.
-  - jstests/core/find_and_modify_server7660.js
-  - jstests/core/upsert_shell.js
+  - jstests/core/**/find_and_modify_server7660.js
+  - jstests/core/**/upsert_shell.js
 
   # "assert: [197] != [[ 6868501 ]] are not equal"
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   ##
diff --git a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
index 970f844e731..85f9995fa64 100644
--- a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
+++ b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
@@ -9,190 +9,190 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   # Create index command arbitrarily picks one of the errors if there are multiple errors from the
   # shards. In this suite, it is possible that one of the shards don't have the collection created
   # so it can return cannot implicitly create collection.
-  - jstests/core/index_create_too_many.js
-  - jstests/core/index_create_with_nul_in_name.js
+  - jstests/core/**/index_create_too_many.js
+  - jstests/core/**/index_create_with_nul_in_name.js
 
   ##
   ## Limitations with the way the runner file injects transactions.
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # TODO: SERVER-38207 Cannot insert document with MaxKey shard key.
-  - jstests/core/type8.js
+  - jstests/core/**/type8.js
 
   # benchRun bypasses the network_error_and_txn_override.js so it doesn't run under the same
   # transaction and can cause test to timeout because of the 3 hr transactions lifetime setting and
   # moveChunk getting blocked trying to acquire collection X lock while doing chunk refresh.
-  - jstests/core/bench_test*.js
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/bench_test*.js
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
 
   ##
   ## Some aggregation stages don't support snapshot readconcern.
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -206,19 +206,19 @@ selector:
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -226,53 +226,53 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   # "Cowardly refusing to override read concern of command: ..."
diff --git a/buildscripts/resmokeconfig/suites/native_tenant_data_isolation_with_dollar_tenant_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/native_tenant_data_isolation_with_dollar_tenant_jscore_passthrough.yml
index 3d57682b8c4..5622a03c951 100644
--- a/buildscripts/resmokeconfig/suites/native_tenant_data_isolation_with_dollar_tenant_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/native_tenant_data_isolation_with_dollar_tenant_jscore_passthrough.yml
@@ -31,23 +31,23 @@ selector:
   - featureFlagColumnstoreIndexes
   exclude_files:
   # The "exhaust" function does not use runCommand (required by the inject_security_token.js override).
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
   # These following tests use benchRun which does not use runCommand (required by the inject_dollar_tenant.js override).
-  - jstests/core/bench_test1.js
-  - jstests/core/bench_test2.js
-  - jstests/core/benchrun_cmd_param_error.js
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/bench_test2.js
+  - jstests/core/**/benchrun_cmd_param_error.js
+  - jstests/core/**/benchrun_pipeline_updates.js
   # These tests run "applyOps" command which does not depend on $tenant to pass in tenant information.
   # The tenantId is provided in the oplog entries provided to the applyOps command.
-  - jstests/core/apply_ops*.js
-  - jstests/core/bypass_doc_validation.js
-  - jstests/core/collation.js
-  - jstests/core/collmod_convert_to_unique_apply_ops.js
-  - jstests/core/collmod_without_uuid.js
-  - jstests/core/list_collections1.js
-  - jstests/core/list_collections_filter.js
-  - jstests/core/list_collections_no_views.js
-  - jstests/core/rename_collection_staytemp.js
+  - jstests/core/**/apply_ops*.js
+  - jstests/core/**/bypass_doc_validation.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/collmod_convert_to_unique_apply_ops.js
+  - jstests/core/**/collmod_without_uuid.js
+  - jstests/core/**/list_collections1.js
+  - jstests/core/**/list_collections_filter.js
+  - jstests/core/**/list_collections_no_views.js
+  - jstests/core/**/rename_collection_staytemp.js
   - jstests/core/txns/commands_banning_txnnumber_outside_transactions.js
   - jstests/core/txns/commands_not_allowed_in_txn.js
   - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js
@@ -57,29 +57,29 @@ selector:
   - jstests/core/views/views_all_commands.js
   - jstests/core/views/views_creation.js
   # This test expects a specific error message, which does not match the error message generated in authentication mode.
-  - jstests/core/commands_with_uuid.js
+  - jstests/core/**/commands_with_uuid.js
   # Sharding command "splictVector" is not tenant aware.
-  - jstests/core/splitvector.js
+  - jstests/core/**/splitvector.js
   # Sharding command "_shardsvrCreateGlobalIndex" is not tenant aware.
   - jstests/core/txns/global_index.js
   # Operations on config.system.sessions are not tenant aware, so cannot be tested with the injected dollar tenant.
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
-  - jstests/core/api_version_pipeline_stages.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
+  - jstests/core/**/api_version_pipeline_stages.js
   # Operations on config.transactions are not tenant aware, so cannot be tested with the injected dollar tenant.
   - jstests/core/txns/no_writes_to_config_transactions_with_prepared_transaction.js
   - jstests/core/txns/commit_prepared_transaction.js
-  - jstests/core/create_indexes.js
+  - jstests/core/**/create_indexes.js
   # In a multitenancy environment the catalog will always return tenant-prefixed entries, so the
   # list_catalog test will be broken as it checks for non-tenant-prefixed entries.
-  - jstests/core/list_catalog.js
+  - jstests/core/**/list_catalog.js
   # TODO SERVER-72285: currentOp requests with dollar tenant cannot get operations being executed by the tenant.
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/currentop.js
-  - jstests/core/currentop_waiting_for_latch.js
-  - jstests/core/failcommand_failpoint.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/currentop_waiting_for_latch.js
+  - jstests/core/**/failcommand_failpoint.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
   - jstests/core/txns/kill_cursors_in_transaction.js
   - jstests/core/txns/kill_sessions_kills_transaction.js
   - jstests/core/txns/transactions_block_ddl.js
@@ -87,9 +87,9 @@ selector:
   - jstests/core/txns/new_transactions_on_session_with_prepared_txn_block_behind_prepare.js
   - jstests/core/txns/write_conflicts_with_non_txns.js
   # TODO SERVER-72291: rolesInfo commmand is failed when querying relative roles by the tenant.
-  - jstests/core/roles_info.js
+  - jstests/core/**/roles_info.js
   # TODO SERVER-72083: tenant information of bulkWrite command cannot be parsed correctly.
-  - jstests/core/bulk_write.js
+  - jstests/core/**/bulk_write.js
   # TODO SERVER-72357: cannot get the expected error due to an authorization contract issue.
   - jstests/core/txns/multi_statement_transaction_command_args.js
 
diff --git a/buildscripts/resmokeconfig/suites/native_tenant_data_isolation_with_security_token_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/native_tenant_data_isolation_with_security_token_jscore_passthrough.yml
index 0d7a13d0f87..e734b3452da 100644
--- a/buildscripts/resmokeconfig/suites/native_tenant_data_isolation_with_security_token_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/native_tenant_data_isolation_with_security_token_jscore_passthrough.yml
@@ -20,53 +20,53 @@ selector:
   - requires_scripting
   exclude_files:
   # server-side javascript is not supported in serverless mode.
-  - jstests/core/system_js_drop.js
-  - jstests/core/system_js_access.js
-  - jstests/core/where_system_js.js
+  - jstests/core/**/system_js_drop.js
+  - jstests/core/**/system_js_access.js
+  - jstests/core/**/where_system_js.js
   # setLogLevel calls setParameter command which is not allowed with security token.
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
   - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
   # cursor.close() calls killCursors command which is not allowed with security token.
-  - jstests/core/list_collections1.js
-  - jstests/core/list_indexes.js
+  - jstests/core/**/list_collections1.js
+  - jstests/core/**/list_indexes.js
   # collection.getPlanCache().* calls planCache* commands which are not allowed with security token.
-  - jstests/core/cached_plan_trial_does_not_discard_work.js
-  - jstests/core/collation_plan_cache.js
-  - jstests/core/explode_for_sort_plan_cache.js
-  - jstests/core/index_filter_commands.js
-  - jstests/core/index_filter_commands_invalidate_plan_cache_entries.js
-  - jstests/core/introspect_hidden_index_plan_cache_entries.js
-  - jstests/core/neq_null_correctly_cache.js
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/plan_cache_list_plans.js
-  - jstests/core/plan_cache_sbe.js
-  - jstests/core/plan_cache_shell_helpers.js
-  - jstests/core/plan_cache_stats_shard_and_host.js
-  - jstests/core/profile_query_hash.js
+  - jstests/core/**/cached_plan_trial_does_not_discard_work.js
+  - jstests/core/**/collation_plan_cache.js
+  - jstests/core/**/explode_for_sort_plan_cache.js
+  - jstests/core/**/index_filter_commands.js
+  - jstests/core/**/index_filter_commands_invalidate_plan_cache_entries.js
+  - jstests/core/**/introspect_hidden_index_plan_cache_entries.js
+  - jstests/core/**/neq_null_correctly_cache.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/plan_cache_list_plans.js
+  - jstests/core/**/plan_cache_sbe.js
+  - jstests/core/**/plan_cache_shell_helpers.js
+  - jstests/core/**/plan_cache_stats_shard_and_host.js
+  - jstests/core/**/profile_query_hash.js
   - jstests/core/sbe/from_plan_cache_flag.js
   - jstests/core/sbe/plan_cache_sbe_with_or_queries.js
   - jstests/core/sbe_plan_cache_autoparameterize_collscan.js
   - jstests/core/timeseries/bucket_unpacking_with_sort_plan_cache.js
-  - jstests/core/wildcard_index_cached_plans.js
+  - jstests/core/**/wildcard_index_cached_plans.js
   # FixtureHelpers.getPrimaries() calls connectionStatus command which is not allowed with security token.
   - jstests/core/txns/transaction_too_large_for_cache.js
   # defaultPrompt() calls buildInfo command which is not allowed with security token.
   - jstests/core/txns/shell_prompt_in_transaction.js
   # Cannot test the user is not allowed to create indexes in config.transactions as the
   # inject_security_token.js runs command on tenant's config.transactions.
-  - jstests/core/create_indexes.js
+  - jstests/core/**/create_indexes.js
   # checkLog calls getLog command which is not allowed  with security token.
-  - jstests/core/doc_validation_options.js
+  - jstests/core/**/doc_validation_options.js
   # exhaust does not use runCommand (required by the inject_security_token.js override).
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
   # This test does not use same connection on same database (required by the inject_security_token.js override).
   - jstests/core/txns/write_conflicts_with_non_txns.js
   # In a multitenancy environment the catalog will always return tenant-prefixed entries, and the
   # override we use in this suite checks for the absence of a prefix breaking the list_catalog tests.
-  - jstests/core/list_catalog.js
+  - jstests/core/**/list_catalog.js
   # This test uses '_hashBSONElement' command that cannot be run with security token.
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/read_concern_linearizable_passthrough.yml b/buildscripts/resmokeconfig/suites/read_concern_linearizable_passthrough.yml
index ac2bc2e0a17..c84deae1fa2 100644
--- a/buildscripts/resmokeconfig/suites/read_concern_linearizable_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/read_concern_linearizable_passthrough.yml
@@ -8,14 +8,14 @@ selector:
   - jstests/core/txns/**/*.js
 
   # These tests use benchRun(), which isn't configured to use the overridden writeConcern.
-  - jstests/core/bench_test*.js
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/bench_test*.js
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
   # fsync.js runs the {fsync: 1, lock: 1} command, which prevents a linearizable read from writing
   # an entry to the oplog.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
   # The NoOp write from linearizable getMores will cause awaitdata_getmore_cmd.js to loop
   # indefinitely as it tails the oplog.
-  - jstests/core/awaitdata_getmore_cmd.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
   exclude_with_any_tags:
   ##
   # The next three tags correspond to the special errors thrown by the
diff --git a/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml
index 9acb1aa461b..78cd645be67 100644
--- a/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml
@@ -9,8 +9,8 @@ selector:
   # Transactions only a readConcern argument on the first command.
   - jstests/core/txns/**/*.js
   # These tests use benchRun(), which isn't configured to use the overridden writeConcern.
-  - jstests/core/bench_test*.js
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/bench_test*.js
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
   exclude_with_any_tags:
   ##
   # The next three tags correspond to the special errors thrown by the
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_fcbis_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_fcbis_jscore_passthrough.yml
index b505af7313a..51be09c6f42 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_fcbis_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_fcbis_jscore_passthrough.yml
@@ -8,33 +8,33 @@ selector:
   exclude_files:
   # Tests that query the system.profile collection cannot run in this suite since an initial sync
   # may insert unexpected operations into the profile collection.
-  - jstests/core/profile_list_collections.js
-  - jstests/core/profile_list_indexes.js
-  - jstests/core/recursion.js
-  - jstests/core/system_profile.js
+  - jstests/core/**/profile_list_collections.js
+  - jstests/core/**/profile_list_indexes.js
+  - jstests/core/**/recursion.js
+  - jstests/core/**/system_profile.js
   # operation_latency_histogram.js and geo_s2cursorlimitskip.js do not expect concurrent reads
   # against their test collections.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/geo_s2cursorlimitskip.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
   # These tests run getLatestProfilerEntry(). The downstream syncing node affects the profiler.
-  - jstests/core/profile_agg.js
-  - jstests/core/profile_count.js
-  - jstests/core/profile_delete.js
-  - jstests/core/profile_distinct.js
-  - jstests/core/profile_find.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/profile_getmore.js
-  - jstests/core/profile_insert.js
-  - jstests/core/profile_mapreduce.js
-  - jstests/core/profile_sampling.js
-  - jstests/core/profile_update.js
+  - jstests/core/**/profile_agg.js
+  - jstests/core/**/profile_count.js
+  - jstests/core/**/profile_delete.js
+  - jstests/core/**/profile_distinct.js
+  - jstests/core/**/profile_find.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/profile_getmore.js
+  - jstests/core/**/profile_insert.js
+  - jstests/core/**/profile_mapreduce.js
+  - jstests/core/**/profile_sampling.js
+  - jstests/core/**/profile_update.js
   - jstests/core/txns/transactions_profiling.js
   # The downstream syncing node affects the top output.
-  - jstests/core/top.js
+  - jstests/core/**/top.js
   # The following tests use fsyncLock which will fail if FCBIS has a backup cursor open.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml
index b3ed1f98509..9ae8f19f6f7 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml
@@ -8,33 +8,33 @@ selector:
   exclude_files:
   # Tests that query the system.profile collection cannot run in this suite since an initial sync
   # may insert unexpected operations into the profile collection.
-  - jstests/core/profile_list_collections.js
-  - jstests/core/profile_list_indexes.js
-  - jstests/core/recursion.js
-  - jstests/core/system_profile.js
+  - jstests/core/**/profile_list_collections.js
+  - jstests/core/**/profile_list_indexes.js
+  - jstests/core/**/recursion.js
+  - jstests/core/**/system_profile.js
   # operation_latency_histogram.js and geo_s2cursorlimitskip.js do not expect concurrent reads
   # against their test collections.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/geo_s2cursorlimitskip.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
   # Having duplicate namespaces is not supported and will cause initial sync to fail.
   - jstests/core/views/duplicate_ns.js
   # These tests run getLatestProfilerEntry(). The downstream syncing node affects the profiler.
-  - jstests/core/profile_agg.js
-  - jstests/core/profile_count.js
-  - jstests/core/profile_delete.js
-  - jstests/core/profile_distinct.js
-  - jstests/core/profile_find.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/profile_getmore.js
-  - jstests/core/profile_insert.js
-  - jstests/core/profile_mapreduce.js
-  - jstests/core/profile_sampling.js
-  - jstests/core/profile_update.js
+  - jstests/core/**/profile_agg.js
+  - jstests/core/**/profile_count.js
+  - jstests/core/**/profile_delete.js
+  - jstests/core/**/profile_distinct.js
+  - jstests/core/**/profile_find.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/profile_getmore.js
+  - jstests/core/**/profile_insert.js
+  - jstests/core/**/profile_mapreduce.js
+  - jstests/core/**/profile_sampling.js
+  - jstests/core/**/profile_update.js
   - jstests/core/txns/transactions_profiling.js
   # The downstream syncing node affects the top output.
-  - jstests/core/top.js
+  - jstests/core/**/top.js
   # Change stream pre-images are not cloned during initial sync.
-  - jstests/core/write_change_stream_pit_preimage.js
+  - jstests/core/**/write_change_stream_pit_preimage.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml
index a497994cc85..35fd9456b93 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml
@@ -9,7 +9,7 @@ selector:
   # Duplicate namespace may cause cloner to try and clone view instead of collection
   - jstests/core/views/duplicate_ns.js
   # Change stream pre-images are not cloned during initial sync.
-  - jstests/core/write_change_stream_pit_preimage.js
+  - jstests/core/**/write_change_stream_pit_preimage.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml
index 3dcb6d39cc9..9bcd88b1673 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml
@@ -14,9 +14,9 @@ selector:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
   # server parameter.
-  - jstests/core/set_param1.js
+  - jstests/core/**/set_param1.js
   # Different explain format
-  - jstests/core/or_to_in.js
+  - jstests/core/**/or_to_in.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_kill_secondaries_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_kill_secondaries_jscore_passthrough.yml
index 380b35d2d1d..6df62268b9f 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_kill_secondaries_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_kill_secondaries_jscore_passthrough.yml
@@ -8,23 +8,23 @@ selector:
   # The following tests perform a write with a writeConcern of w=2 when 'testingReplication' is
   # true. This causes the test to hang because the secondary is running with the "rsSyncApplyStop"
   # failpoint enabled.
-  - jstests/core/geo_update_btree.js
+  - jstests/core/**/geo_update_btree.js
   # The following tests create large oplog entries, which can cause the secondary to fall off the
   # primary's oplog when run as a part of burn_in_tests.
-  - jstests/core/max_doc_size.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/capped_large_docs.js
-  - jstests/core/capped_resize.js
-  - jstests/core/exhaust.js
+  - jstests/core/**/max_doc_size.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/capped_large_docs.js
+  - jstests/core/**/capped_resize.js
+  - jstests/core/**/exhaust.js
   # The following tests also create large oplog entries due to the maximum blocking sort size being
   # 100 MB.
-  - jstests/core/explain_execution_error.js
-  - jstests/core/sortb.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
   # The following test tries to directly query secondaries, which fails if the secondary has been
   # killed.
-  - jstests/core/column_store_index_compression.js
+  - jstests/core/**/column_store_index_compression.js
   exclude_with_any_tags:
   - assumes_standalone_mongod
   # emptycapped is not supported with rollback using recover-to-timestamp.
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
index 8e6ddda82f2..946cc1d6b0d 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
@@ -13,64 +13,64 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/api_params_getmore.js
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/clustered_collection_basic.js # DuplicateKeys, too large RecordId's
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_and_modify_invalid_query_params.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/api_params_getmore.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/clustered_collection_basic.js # DuplicateKeys, too large RecordId's
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_and_modify_invalid_query_params.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/notablescan.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/projection_expr_mod.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/notablescan.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/projection_expr_mod.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
   - jstests/core/timeseries/timeseries_special_indexes_metadata.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -80,60 +80,60 @@ selector:
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/distinct_multikey_dotted_path.js
-  - jstests/core/distinct_with_hashed_index.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/distinct_multikey_dotted_path.js
+  - jstests/core/**/distinct_with_hashed_index.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $indexStats
-  - jstests/core/index_stats.js
+  - jstests/core/**/index_stats.js
   - jstests/core/timeseries/timeseries_index_stats.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -147,19 +147,19 @@ selector:
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -167,57 +167,57 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_collections1.js
-  - jstests/core/list_indexes.js
-  - jstests/core/list_indexes_invalidation.js
-  - jstests/core/list_namespaces_invalidation.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_collections1.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/list_indexes_invalidation.js
+  - jstests/core/**/list_namespaces_invalidation.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # "The 'got' response is overriden which causes assertion failures."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index 975be8f9727..53b8d8e3de7 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -12,59 +12,59 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_and_modify_invalid_query_params.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_and_modify_invalid_query_params.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -74,53 +74,53 @@ selector:
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -134,19 +134,19 @@ selector:
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -154,82 +154,82 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   # Creates new mongo connection but won't retry connecting.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/project_with_collation.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # Examines _id of upserted document.
-  - jstests/core/find_and_modify_server7660.js
-  - jstests/core/upsert_shell.js
+  - jstests/core/**/find_and_modify_server7660.js
+  - jstests/core/**/upsert_shell.js
   exclude_with_any_tags:
   - assumes_standalone_mongod
   ##
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
index f1032729f8c..bb59e2d0b09 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
@@ -12,58 +12,58 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_and_modify_invalid_query_params.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_and_modify_invalid_query_params.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -73,53 +73,53 @@ selector:
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/explain_server_params.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/explain_server_params.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -133,19 +133,19 @@ selector:
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -153,76 +153,76 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   # Creates new mongo connection but won't retry connecting.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # Examines _id of upserted document.
-  - jstests/core/find_and_modify_server7660.js
-  - jstests/core/upsert_shell.js
+  - jstests/core/**/find_and_modify_server7660.js
+  - jstests/core/**/upsert_shell.js
   exclude_with_any_tags:
   - assumes_standalone_mongod
   ##
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
index 556675ca620..37f9e6b10ce 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
@@ -12,112 +12,112 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_and_modify_invalid_query_params.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_and_modify_invalid_query_params.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   ##
   ## Some aggregation stages don't support snapshot readconcern.
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/explain_server_params.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/explain_server_params.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -131,19 +131,19 @@ selector:
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -151,85 +151,85 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   # Creates new mongo connection but won't retry connecting.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
 
   # Examines _id of upserted document.
-  - jstests/core/find_and_modify_server7660.js
-  - jstests/core/upsert_shell.js
+  - jstests/core/**/find_and_modify_server7660.js
+  - jstests/core/**/upsert_shell.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml
index 4dcfffe0064..9baa473f3e4 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml
@@ -16,17 +16,17 @@ selector:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
   # server parameter.
-  - jstests/core/set_param1.js
+  - jstests/core/**/set_param1.js
 
   # These test run commands using legacy queries, which are not supported on sessions.
-  - jstests/core/comment_field.js
-  - jstests/core/exhaust.js
+  - jstests/core/**/comment_field.js
+  - jstests/core/**/exhaust.js
 
   # Unacknowledged writes prohibited in an explicit session.
-  - jstests/core/batch_write_command_w0.js
-  - jstests/core/crud_api.js
+  - jstests/core/**/batch_write_command_w0.js
+  - jstests/core/**/crud_api.js
 
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
 
   # TODO: SERVER-71487 Legacy shell does not carry over encryption information through
   # getMores in reconfig suites.
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
index b37bed5442c..8fd0180ba92 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
@@ -14,64 +14,64 @@ selector:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
   # server parameter.
-  - jstests/core/set_param1.js
+  - jstests/core/**/set_param1.js
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_pipeline_update.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_pipeline_update.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/project_with_collation.js
 
   # These test run commands using legacy queries, which are not supported on sessions.
-  - jstests/core/comment_field.js
-  - jstests/core/exhaust.js
+  - jstests/core/**/comment_field.js
+  - jstests/core/**/exhaust.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Unacknowledged writes prohibited in an explicit session.
-  - jstests/core/batch_write_command_w0.js
+  - jstests/core/**/batch_write_command_w0.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/top.js # Tests read commands (including getMore) against the secondary
-  - jstests/core/drop3.js # getMore is not causally consistent if collection is dropped
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/top.js # Tests read commands (including getMore) against the secondary
+  - jstests/core/**/drop3.js # getMore is not causally consistent if collection is dropped
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
 
   # Tests that fail for Causal Consistency as they have statements that do not support
   # non-local read concern.
-  - jstests/core/collation.js
+  - jstests/core/**/collation.js
   # Parallel shell is not causally consistent
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/shellstartparallel.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/shellstartparallel.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
index 65d98897ace..70a46e3d291 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
@@ -9,46 +9,46 @@ selector:
   - jstests/core/txns/**/*.js
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   # Creates new mongo connection but won't retry connecting.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml b/buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml
index 1cb40f8e8ff..7ff00c1788a 100644
--- a/buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml
+++ b/buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml
@@ -11,50 +11,50 @@ selector:
   - jstests/core/txns/**/*.js
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   # Creates new mongo connection but won't retry connecting.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
   # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary.
-  - jstests/core/geo_s2ordering.js
+  - jstests/core/**/geo_s2ordering.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml
index d7851ee93c1..35caa128159 100644
--- a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml
@@ -11,36 +11,36 @@ selector:
   - jstests/core/txns/**/*.js
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # These test run commands using legacy queries, which are not supported on sessions.
-  - jstests/core/comment_field.js
-  - jstests/core/exhaust.js
+  - jstests/core/**/comment_field.js
+  - jstests/core/**/exhaust.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_pipeline_update.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_pipeline_update.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/project_with_collation.js
 
   # These tests rely on the assumption that an update command is run only once.
-  - jstests/core/find_and_modify_metrics.js
-  - jstests/core/update_metrics.js
+  - jstests/core/**/find_and_modify_metrics.js
+  - jstests/core/**/update_metrics.js
 
   # This test makes the assumption that a command is run a certain number of times, but
   # the retryable writes suite overrides the runCommand to repeat commands.
-  - jstests/core/failcommand_failpoint.js
+  - jstests/core/**/failcommand_failpoint.js
 
   # Unacknowledged writes prohibited in an explicit session.
-  - jstests/core/batch_write_command_w0.js
+  - jstests/core/**/batch_write_command_w0.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
index 017cc313537..d6b9a27e561 100644
--- a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
@@ -9,48 +9,48 @@ selector:
   - jstests/core/txns/**/*.js
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/secondary_reads_passthrough.yml b/buildscripts/resmokeconfig/suites/secondary_reads_passthrough.yml
index 5848ee5bb64..03553d7dfd1 100644
--- a/buildscripts/resmokeconfig/suites/secondary_reads_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/secondary_reads_passthrough.yml
@@ -8,25 +8,25 @@ selector:
   - jstests/core/txns/**/*.js
 
   # Parallel shell is not causally consistent
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/cursora.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/fsync.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/cursora.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/fsync.js
   # benchRun cannot be overridden to be causally consistent
-  - jstests/core/bench_test*.js
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/bench_test*.js
+  - jstests/core/**/benchrun_pipeline_updates.js
   # getMore is not causal consistent because afterClusterTime has been specified
   # by the preceding find command which establishes the cursor. Therefore,
   # getMore cannot be guaranteed to get executed after commands in between find
   # and getMore.
-  - jstests/core/drop3.js
-  - jstests/core/ord.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/collation.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/collation.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/session_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/session_jscore_passthrough.yml
index 9a44de18f12..f9d0fa83f26 100644
--- a/buildscripts/resmokeconfig/suites/session_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/session_jscore_passthrough.yml
@@ -8,12 +8,12 @@ selector:
   - jstests/core/txns/**/*.js
 
   # These test run commands using legacy queries, which are not supported on sessions.
-  - jstests/core/comment_field.js
-  - jstests/core/exhaust.js
+  - jstests/core/**/comment_field.js
+  - jstests/core/**/exhaust.js
 
   # Unacknowledged writes prohibited in an explicit session.
-  - jstests/core/crud_api.js
-  - jstests/core/batch_write_command_w0.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/batch_write_command_w0.js
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml
index e02dee198fc..e0555d35efb 100644
--- a/buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml
@@ -35,57 +35,57 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/api_params_getmore.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_and_modify_invalid_query_params.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/api_params_getmore.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_and_modify_invalid_query_params.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/max_doc_size.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/projection_expr_mod.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
+  - jstests/core/**/max_doc_size.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/projection_expr_mod.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -95,26 +95,26 @@ selector:
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/distinct_multikey_dotted_path.js
-  - jstests/core/distinct_with_hashed_index.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/distinct_multikey_dotted_path.js
+  - jstests/core/**/distinct_with_hashed_index.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $indexStats
-  - jstests/core/index_stats.js
+  - jstests/core/**/index_stats.js
 
   # $collStats
   - jstests/core/views/views_coll_stats.js
@@ -122,25 +122,25 @@ selector:
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/positional_projection.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_dbref.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/positional_projection.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_dbref.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -154,69 +154,69 @@ selector:
   ##
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
   - jstests/core/views/views_all_commands.js
 
   # Fails with implicit sessions because it will use multiple sessions on the same Mongo connection.
-  - jstests/core/dropdb.js
+  - jstests/core/**/dropdb.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/list_indexes_invalidation.js
-  - jstests/core/list_namespaces_invalidation.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/list_indexes_invalidation.js
+  - jstests/core/**/list_namespaces_invalidation.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # "The 'got' response is overriden which causes assertion failures."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/shard_merge_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_merge_multi_stmt_txn_jscore_passthrough.yml
index afbd1417ea4..cb7cf54c8a8 100644
--- a/buildscripts/resmokeconfig/suites/shard_merge_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/shard_merge_multi_stmt_txn_jscore_passthrough.yml
@@ -35,57 +35,57 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/api_params_getmore.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_and_modify_invalid_query_params.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/api_params_getmore.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_and_modify_invalid_query_params.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/max_doc_size.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/projection_expr_mod.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
+  - jstests/core/**/max_doc_size.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/projection_expr_mod.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -95,26 +95,26 @@ selector:
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/distinct_multikey_dotted_path.js
-  - jstests/core/distinct_with_hashed_index.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/distinct_multikey_dotted_path.js
+  - jstests/core/**/distinct_with_hashed_index.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $indexStats
-  - jstests/core/index_stats.js
+  - jstests/core/**/index_stats.js
 
   # $collStats
   - jstests/core/views/views_coll_stats.js
@@ -122,25 +122,25 @@ selector:
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/positional_projection.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_dbref.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/positional_projection.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_dbref.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -154,69 +154,69 @@ selector:
   ##
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
   - jstests/core/views/views_all_commands.js
 
   # Fails with implicit sessions because it will use multiple sessions on the same Mongo connection.
-  - jstests/core/dropdb.js
+  - jstests/core/**/dropdb.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/list_indexes_invalidation.js
-  - jstests/core/list_namespaces_invalidation.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/list_indexes_invalidation.js
+  - jstests/core/**/list_namespaces_invalidation.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # "The 'got' response is overriden which causes assertion failures."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/shard_split_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_causally_consistent_jscore_passthrough.yml
index 69e2d583d9c..d20b66abdd8 100644
--- a/buildscripts/resmokeconfig/suites/shard_split_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/shard_split_causally_consistent_jscore_passthrough.yml
@@ -24,55 +24,55 @@ selector:
   # Denylists from causally_consistent_jscore_passthrough.yml
   #
 
-  - jstests/core/stages_delete.js # Uses stageDebug command for deletes.
+  - jstests/core/**/stages_delete.js # Uses stageDebug command for deletes.
   # Tests that fail for Causal Consistency as they have statements that do not support
   # non-local read concern.
-  - jstests/core/geo_big_polygon3.js
-  - jstests/core/mr*.js
-  - jstests/core/collation.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/bypass_doc_validation.js
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/constructors.js
+  - jstests/core/**/geo_big_polygon3.js
+  - jstests/core/**/mr*.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/bypass_doc_validation.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/constructors.js
   - jstests/core/views/views_all_commands.js
-  - jstests/core/or4.js
-  - jstests/core/recursion.js
+  - jstests/core/**/or4.js
+  - jstests/core/**/recursion.js
   # An index drop does not necessarily cause cursors to be killed on the secondary.
-  - jstests/core/ord.js
+  - jstests/core/**/ord.js
   # The `dbstats` command builds in-memory structures that are not causally consistent.
-  - jstests/core/dbstats.js
+  - jstests/core/**/dbstats.js
   # TODO SERVER-30466
-  - jstests/core/explain_multi_plan.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/update_arrayFilters.js
+  - jstests/core/**/explain_multi_plan.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/update_arrayFilters.js
   # TODO SERVER-30488
   # In-memory data structures are not causally consistent.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/orf.js #explain.executionStats is not CC
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/orf.js #explain.executionStats is not CC
   # getMore is not causally consistent if collection is dropped
-  - jstests/core/drop3.js
+  - jstests/core/**/drop3.js
   # Explain format is not the same
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain()
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
 
   #
   # Denylists from session_jscore_passthrough.yml
   #
 
   # These test run commands using legacy queries, which are not supported on sessions.
-  - jstests/core/comment_field.js
-  - jstests/core/exhaust.js
+  - jstests/core/**/comment_field.js
+  - jstests/core/**/exhaust.js
 
   # Unacknowledged writes prohibited in an explicit session.
-  - jstests/core/crud_api.js
-  - jstests/core/batch_write_command_w0.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/batch_write_command_w0.js
 
   # Causes CappedPositionLost on recipient, which is not recoverable.
-  - jstests/core/rename_collection_capped.js
+  - jstests/core/**/rename_collection_capped.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/shard_split_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_kill_primary_jscore_passthrough.yml
index a70e99a615f..c8f93b86823 100644
--- a/buildscripts/resmokeconfig/suites/shard_split_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/shard_split_kill_primary_jscore_passthrough.yml
@@ -23,70 +23,70 @@ selector:
 
   # This test runs createIndexes commands without asserting they succeed and depends on a particular
   # index to exist.
-  - jstests/core/index_many2.js
+  - jstests/core/**/index_many2.js
 
   #
   # From retryable writes jscore stepdown passthrough
   #
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   #
   # Denylists specific to this suite
   #
 
-  - jstests/core/api_version_parameters.js
-  - jstests/core/command_let_variables.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/explain_includes_command.js
-  - jstests/core/explain_multi_plan.js
-  - jstests/core/explain_uuid.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/noop_writes.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/sortl.js
+  - jstests/core/**/api_version_parameters.js
+  - jstests/core/**/command_let_variables.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/explain_includes_command.js
+  - jstests/core/**/explain_multi_plan.js
+  - jstests/core/**/explain_uuid.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/noop_writes.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/sortl.js
   exclude_with_any_tags:
   - assumes_standalone_mongod
   # Cursor ids will not survive rerouting between replica sets during a shard split.
diff --git a/buildscripts/resmokeconfig/suites/shard_split_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_multi_stmt_txn_jscore_passthrough.yml
index 81665a2ad67..6a103027b7f 100644
--- a/buildscripts/resmokeconfig/suites/shard_split_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/shard_split_multi_stmt_txn_jscore_passthrough.yml
@@ -36,57 +36,57 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/api_params_getmore.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_and_modify_invalid_query_params.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/api_params_getmore.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_and_modify_invalid_query_params.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/max_doc_size.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/projection_expr_mod.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
+  - jstests/core/**/max_doc_size.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/projection_expr_mod.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -96,26 +96,26 @@ selector:
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/distinct_multikey_dotted_path.js
-  - jstests/core/distinct_with_hashed_index.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/distinct_multikey_dotted_path.js
+  - jstests/core/**/distinct_with_hashed_index.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $indexStats
-  - jstests/core/index_stats.js
+  - jstests/core/**/index_stats.js
 
   # $collStats
   - jstests/core/views/views_coll_stats.js
@@ -123,25 +123,25 @@ selector:
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/positional_projection.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_dbref.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/positional_projection.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_dbref.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   # Collection drops done through applyOps are not converted to w:majority
   - jstests/core/views/invalid_system_views.js
@@ -151,69 +151,69 @@ selector:
   ##
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
   - jstests/core/views/views_all_commands.js
 
   # Fails with implicit sessions because it will use multiple sessions on the same Mongo connection.
-  - jstests/core/dropdb.js
+  - jstests/core/**/dropdb.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/list_indexes_invalidation.js
-  - jstests/core/list_namespaces_invalidation.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/list_indexes_invalidation.js
+  - jstests/core/**/list_namespaces_invalidation.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # "The 'got' response is overriden which causes assertion failures."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/shard_split_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_stepdown_jscore_passthrough.yml
index cbf2ada3128..7210a7b8a3f 100644
--- a/buildscripts/resmokeconfig/suites/shard_split_stepdown_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/shard_split_stepdown_jscore_passthrough.yml
@@ -23,70 +23,70 @@ selector:
 
   # This test runs createIndexes commands without asserting they succeed and depends on a particular
   # index to exist.
-  - jstests/core/index_many2.js
+  - jstests/core/**/index_many2.js
 
   #
   # From retryable writes jscore stepdown passthrough
   #
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   #
   # Denylists specific to this suite
   #
 
-  - jstests/core/api_version_parameters.js
-  - jstests/core/command_let_variables.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/explain_includes_command.js
-  - jstests/core/explain_multi_plan.js
-  - jstests/core/explain_uuid.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/noop_writes.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/sortl.js
+  - jstests/core/**/api_version_parameters.js
+  - jstests/core/**/command_let_variables.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/explain_includes_command.js
+  - jstests/core/**/explain_multi_plan.js
+  - jstests/core/**/explain_uuid.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/noop_writes.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/sortl.js
   exclude_with_any_tags:
   - assumes_standalone_mongod
   # Cursor ids will not survive rerouting between replica sets during a shard split.
diff --git a/buildscripts/resmokeconfig/suites/shard_split_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_terminate_primary_jscore_passthrough.yml
index 277f69e2470..5d429d72f3a 100644
--- a/buildscripts/resmokeconfig/suites/shard_split_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/shard_split_terminate_primary_jscore_passthrough.yml
@@ -23,70 +23,70 @@ selector:
 
   # This test runs createIndexes commands without asserting they succeed and depends on a particular
   # index to exist.
-  - jstests/core/index_many2.js
+  - jstests/core/**/index_many2.js
 
   #
   # From retryable writes jscore stepdown passthrough
   #
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   #
   # Denylists specific to this suite
   #
 
-  - jstests/core/api_version_parameters.js
-  - jstests/core/command_let_variables.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/explain_includes_command.js
-  - jstests/core/explain_multi_plan.js
-  - jstests/core/explain_uuid.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/noop_writes.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/sortl.js
+  - jstests/core/**/api_version_parameters.js
+  - jstests/core/**/command_let_variables.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/explain_includes_command.js
+  - jstests/core/**/explain_multi_plan.js
+  - jstests/core/**/explain_uuid.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/noop_writes.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/sortl.js
   exclude_with_any_tags:
   - assumes_standalone_mongod
   # Cursor ids will not survive rerouting between replica sets during a shard split.
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
index 62b355d91c4..a89d3bcdaf5 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
@@ -10,45 +10,45 @@ selector:
   exclude_files:
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain()
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # This test uses `benchRun` which spawns connections which do not inherit the causal session.
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/benchrun_pipeline_updates.js
   # "Error: [197] != [[ 6868501 ]] are not equal"
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
 
   exclude_with_any_tags:
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml
index 7b3e7a645f1..10421ce5680 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml
@@ -10,48 +10,48 @@ selector:
   exclude_files:
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
   # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/explain_missing_database.js
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain()
+  - jstests/core/**/explain_missing_database.js
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # TODO SERVER-61050
   - jstests/core/timeseries/timeseries_merge.js
   # This test uses `benchRun` which spawns connections which do not inherit the causal session.
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/benchrun_pipeline_updates.js
   # "The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   # Tests tagged with the following will fail because they assume collections are not sharded.
diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
index 3ad625ef785..add558ff51f 100644
--- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
@@ -11,66 +11,66 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/awaitdata_getmore_cmd.js  # capped collections.
-  - jstests/core/bypass_doc_validation.js  # sharded $out output not permitted
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/tailable_cursor_invalidation.js # capped collections.
-  - jstests/core/tailable_getmore_batch_size.js # capped collections.
-  - jstests/core/tailable_skip_limit.js # capped collections.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/awaitdata_getmore_cmd.js  # capped collections.
+  - jstests/core/**/bypass_doc_validation.js  # sharded $out output not permitted
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/tailable_cursor_invalidation.js # capped collections.
+  - jstests/core/**/tailable_getmore_batch_size.js # capped collections.
+  - jstests/core/**/tailable_skip_limit.js # capped collections.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos, SERVER-18047.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
   # The following tests fail because they count indexes. These counts do not take into account the
   # additional hashed shard key indexes that are automatically added by this passthrough.
-  - jstests/core/apitest_dbcollection.js
-  - jstests/core/bad_index_plugin.js
-  - jstests/core/create_indexes.js
-  - jstests/core/list_indexes_non_existent_ns.js
-  - jstests/core/mr_preserve_indexes.js
+  - jstests/core/**/apitest_dbcollection.js
+  - jstests/core/**/bad_index_plugin.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/list_indexes_non_existent_ns.js
+  - jstests/core/**/mr_preserve_indexes.js
   # The following tests fail because they expect no databases to be created. However a DB is created
   # automatically when we shard a collection.
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/no_db_created.js
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/no_db_created.js
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # These tests fail because sharded clusters do not clean up correctly after failed index builds.
   # See SERVER-33207 as an example.
-  - jstests/core/geo_borders.js
+  - jstests/core/**/geo_borders.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.
-  - jstests/core/distinct_index1.js
-  - jstests/core/explain1.js
-  - jstests/core/explain4.js
-  - jstests/core/sortk.js
+  - jstests/core/**/distinct_index1.js
+  - jstests/core/**/explain1.js
+  - jstests/core/**/explain4.js
+  - jstests/core/**/sortk.js
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
-  - jstests/core/explain_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/explain_count.js
+  - jstests/core/**/explain_server_params.js
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
-  - jstests/core/expr_index_use.js
-  - jstests/core/index_multikey.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/expr_index_use.js
+  - jstests/core/**/index_multikey.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   # "Error: The field '$const' is not valid for an index specification."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
index 496d61c4116..741d0ebe749 100644
--- a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
@@ -9,33 +9,33 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
   # The following tests fail because of divergent dropCollection behavior between standalones and
   # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
   # we expect a second drop to return status OK.
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -45,118 +45,118 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/api_params_getmore.js
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_large_and_small_dates.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/api_params_getmore.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_large_and_small_dates.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
   - jstests/core/timeseries/timeseries_special_indexes_metadata.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
-  - jstests/core/updatej.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
+  - jstests/core/**/updatej.js
 
   ##
   ## Some aggregation stages don't support snapshot readconcern.
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/distinct_multikey_dotted_path.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/distinct_multikey_dotted_path.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $indexStats
   - jstests/core/timeseries/timeseries_index_stats.js
 
   # $collStats
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
   - jstests/core/views/views_coll_stats.js
   - jstests/core/views/views_stats.js
 
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/bulk_api_ordered.js
-  - jstests/core/bulk_api_unordered.js
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_dbref.js
-  - jstests/core/updatel.js
-  - jstests/core/write_result.js
-  - jstests/core/positional_projection.js
+  - jstests/core/**/bulk_api_ordered.js
+  - jstests/core/**/bulk_api_unordered.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_dbref.js
+  - jstests/core/**/updatel.js
+  - jstests/core/**/write_result.js
+  - jstests/core/**/positional_projection.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -170,19 +170,19 @@ selector:
   ##
 
   # SERVER-34868 Cannot run a legacy query on a session.
-  - jstests/core/exhaust.js
+  - jstests/core/**/exhaust.js
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Wrong count for top info (WriteLock)
-  - jstests/core/top.js
+  - jstests/core/**/top.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
@@ -190,51 +190,51 @@ selector:
   - jstests/core/views/views_all_commands.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/list_namespaces_invalidation.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/list_namespaces_invalidation.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/currentop.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/fsync.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   exclude_with_any_tags:
   # "Cowardly refusing to override read concern of command: ..."
diff --git a/buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml b/buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml
index 0b2a40c9cb1..8fcbc4707b0 100644
--- a/buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml
@@ -11,65 +11,65 @@ selector:
   - jstests/core/txns/**/*.js
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   # Creates new mongo connection but won't retry connecting.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
   # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary.
-  - jstests/core/geo_s2ordering.js
+  - jstests/core/**/geo_s2ordering.js
 
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
 
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
 
   # This file is testing resmoke's multiversion framework, not Server behavior
-  - jstests/core/mixed_version_replica_set.js
+  - jstests/core/**/mixed_version_replica_set.js
 
   # TODO SERVER-61050
   - jstests/core/timeseries/timeseries_merge.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_api_version_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_api_version_jscore_passthrough.yml
index ddcec67ad56..b1ad561ceff 100644
--- a/buildscripts/resmokeconfig/suites/sharding_api_version_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_api_version_jscore_passthrough.yml
@@ -20,34 +20,34 @@ selector:
 
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain()
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
   # The following tests fail because of divergent dropCollection behavior between standalones and
   # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
   # we expect a second drop to return status OK.
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
 
   # transactionLifetimeLimitSeconds parameter is not available in mongos.
   - jstests/core/txns/abort_expired_transaction.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
index 9009b43d519..926894a522b 100644
--- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
@@ -10,34 +10,34 @@ selector:
   - jstests/core/txns/**/*.js
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/collection_truncate.js  # emptycapped.
-  - jstests/core/compact_keeps_indexes.js  # compact.
-  - jstests/core/currentop.js  # uses fsync.
-  - jstests/core/dbhash.js  # dbhash.
-  - jstests/core/dbhash2.js  # dbhash.
-  - jstests/core/fsync.js  # uses fsync.
-  - jstests/core/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/geo_update_btree2.js  # notablescan.
-  - jstests/core/index9.js  # "local" database.
-  - jstests/core/queryoptimizera.js  # "local" database.
-  - jstests/core/stages*.js  # stageDebug.
-  - jstests/core/startup_log.js  # "local" database.
-  - jstests/core/top.js  # top.
+  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
+  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
+  - jstests/core/**/collection_truncate.js  # emptycapped.
+  - jstests/core/**/compact_keeps_indexes.js  # compact.
+  - jstests/core/**/currentop.js  # uses fsync.
+  - jstests/core/**/dbhash.js  # dbhash.
+  - jstests/core/**/dbhash2.js  # dbhash.
+  - jstests/core/**/fsync.js  # uses fsync.
+  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
+  - jstests/core/**/geo_update_btree2.js  # notablescan.
+  - jstests/core/**/index9.js  # "local" database.
+  - jstests/core/**/queryoptimizera.js  # "local" database.
+  - jstests/core/**/stages*.js  # stageDebug.
+  - jstests/core/**/startup_log.js  # "local" database.
+  - jstests/core/**/top.js  # top.
   # The following tests fail because mongos behaves differently from mongod when testing certain
   # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
-  - jstests/core/killop_drop_collection.js # Uses fsyncLock.
-  - jstests/core/or_to_in.js # queryPlanner in different spot in explain()
+  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
+  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
+  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
+  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
+  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
+  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
+  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
   # The following tests fail because of divergent dropCollection behavior between standalones and
   # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
   # we expect a second drop to return status OK.
-  - jstests/core/explain_upsert.js
+  - jstests/core/**/explain_upsert.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_jscore_passthrough.yml
index febca889012..5c7fb0c2a60 100644
--- a/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_jscore_passthrough.yml
@@ -10,7 +10,7 @@ selector:
   # case. That is not always true when the test driver use a replica set connection string. As this
   # test sets fail point with error code NotWritablePrimary, the test driver changes its topology to
   # ReplicaSetNoPrimary and create a new connection once it get the primary again.
-  - jstests/core/failcommand_failpoint.js
+  - jstests/core/**/failcommand_failpoint.js
   # TODO: SERVER-71487 Legacy shell does not carry over encryption information through
   # getMores in reconfig suites.
   - src/mongo/db/modules/*/jstests/fle2/query/*getMore*.js
diff --git a/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_kill_primary_jscore_passthrough.yml
index 83ab91d1167..fa61974ace6 100644
--- a/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_kill_primary_jscore_passthrough.yml
@@ -8,59 +8,59 @@ selector:
   # case. That is not always true when the test driver use a replica set connection string. As this
   # test sets fail point with error code NotWritablePrimary, the test driver changes its topology to
   # ReplicaSetNoPrimary and create a new connection once it get the primary again.
-  - jstests/core/failcommand_failpoint.js
+  - jstests/core/**/failcommand_failpoint.js
 
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).
   - jstests/core/txns/**/*.js
 
   # No-op retries are not ignored by top.
-  - jstests/core/operation_latency_histogram.js
+  - jstests/core/**/operation_latency_histogram.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
 
   # Creates new mongo connection but won't retry connecting.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
   # The next two tests have no tag "requires_non_retryable_commands" but errors thrown by
   # the network_error_and_txn_override.js override when it refuses to run a certain command.
   # "Refusing to run a test that issues commands that are not blindly retryable"
-  - jstests/core/profile3.js
-  - jstests/core/list_collections_filter.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/list_collections_filter.js
   # The next two tests have no tag "requires_non_retryable_writes" but errors thrown by
   # the network_error_and_txn_override.js override when it refuses to run a certain command.
   # "Refusing to run a test that issues non-retryable write operations since the test likely makes
   # assertions on the write results and can lead to spurious failures if a network error occurs"
-  - jstests/core/crud_api.js
+  - jstests/core/**/crud_api.js
   - jstests/core/views/views_stats.js
   # The next one test has no tag "does_not_support_stepdowns" but errors thrown by
   # the network_error_and_txn_override.js override when it refuses to run a certain command.
   # "Refusing to run a test that issues commands that may return different values after a failover"
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expect failure to connect server with an empty connection string.
   # But, network_error_and_txn_override.js override keeps retrying forever.
-  - jstests/core/connection_string_validation.js
+  - jstests/core/**/connection_string_validation.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_causally_consistent_jscore_passthrough.yml
index 92f487b9a5b..0ff7c9b7fcf 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_causally_consistent_jscore_passthrough.yml
@@ -16,19 +16,19 @@ selector:
   # Skip any tests that run with auth explicitly.
   - jstests/core/*[aA]uth*.js
   # This test uses `benchRun` which spawns connections which do not inherit the causal session.
-  - jstests/core/benchrun_pipeline_updates.js
+  - jstests/core/**/benchrun_pipeline_updates.js
 
   #
   # Denylists from session_jscore_passthrough.yml
   #
 
   # These test run commands using legacy queries, which are not supported on sessions.
-  - jstests/core/comment_field.js
-  - jstests/core/exhaust.js
+  - jstests/core/**/comment_field.js
+  - jstests/core/**/exhaust.js
 
   # Unacknowledged writes prohibited in an explicit session.
-  - jstests/core/crud_api.js
-  - jstests/core/batch_write_command_w0.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/batch_write_command_w0.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
index 5c48ad527c7..38d5fc19d3b 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
@@ -22,89 +22,89 @@ selector:
 
   # This test runs createIndexes commands without asserting they succeed and depends on a particular
   # index to exist.
-  - jstests/core/index_many2.js
+  - jstests/core/**/index_many2.js
 
   #
   # From retryable writes jscore stepdown passthrough
   #
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   #
   # Denylists specific to this suite
   #
 
-  - jstests/core/api_version_parameters.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/bypass_doc_validation.js
-  - jstests/core/collation.js
-  - jstests/core/command_json_schema_field.js
-  - jstests/core/command_let_variables.js
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/disallow_system_views_user_writes.js
-  - jstests/core/doc_validation.js
-  - jstests/core/explain_includes_command.js
-  - jstests/core/explain_multi_plan.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/explain_uuid.js
-  - jstests/core/expr.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/index_stats.js
+  - jstests/core/**/api_version_parameters.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/bypass_doc_validation.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/command_json_schema_field.js
+  - jstests/core/**/command_let_variables.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/disallow_system_views_user_writes.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/explain_includes_command.js
+  - jstests/core/**/explain_multi_plan.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/explain_uuid.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/index_stats.js
   - jstests/core/json_schema/misc_validation.js
-  - jstests/core/noop_writes.js
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/profile_mapreduce.js
-  - jstests/core/sortl.js
-  - jstests/core/system_profile.js
-  - jstests/core/top.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_pipeline_shell_helpers.js
-  - jstests/core/verify_update_mods.js
+  - jstests/core/**/noop_writes.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/profile_mapreduce.js
+  - jstests/core/**/sortl.js
+  - jstests/core/**/system_profile.js
+  - jstests/core/**/top.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_pipeline_shell_helpers.js
+  - jstests/core/**/verify_update_mods.js
   - jstests/core/views/invalid_system_views.js
   - jstests/core/views/views_all_commands.js
   exclude_with_any_tags:
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml
index f2fc0ec7121..4f6feb4d477 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml
@@ -35,57 +35,57 @@ selector:
   ##
 
   # These tests expects some statements to error, which will cause txns to abort entirely.
-  - jstests/core/api_params_getmore.js
-  - jstests/core/commands_with_uuid.js
-  - jstests/core/dbcase.js
-  - jstests/core/dbcase2.js
-  - jstests/core/explain_execution_error.js
-  - jstests/core/expr.js
-  - jstests/core/find9.js
-  - jstests/core/find_and_modify_invalid_query_params.js
-  - jstests/core/find_getmore_bsonsize.js
-  - jstests/core/find_getmore_cmd.js
-  - jstests/core/geo_allowedcomparisons.js
-  - jstests/core/geo_big_polygon2.js
-  - jstests/core/geonear_key.js
-  - jstests/core/in.js
-  - jstests/core/index8.js # No explicit check for failed command.
-  - jstests/core/index_decimal.js
-  - jstests/core/index_multiple_compatibility.js
-  - jstests/core/index_partial_write_ops.js
-  - jstests/core/indexa.js # No explicit check for failed command.
-  - jstests/core/indexes_multiple_commands.js
-  - jstests/core/js2.js
+  - jstests/core/**/api_params_getmore.js
+  - jstests/core/**/commands_with_uuid.js
+  - jstests/core/**/dbcase.js
+  - jstests/core/**/dbcase2.js
+  - jstests/core/**/explain_execution_error.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/find9.js
+  - jstests/core/**/find_and_modify_invalid_query_params.js
+  - jstests/core/**/find_getmore_bsonsize.js
+  - jstests/core/**/find_getmore_cmd.js
+  - jstests/core/**/geo_allowedcomparisons.js
+  - jstests/core/**/geo_big_polygon2.js
+  - jstests/core/**/geonear_key.js
+  - jstests/core/**/in.js
+  - jstests/core/**/index8.js # No explicit check for failed command.
+  - jstests/core/**/index_decimal.js
+  - jstests/core/**/index_multiple_compatibility.js
+  - jstests/core/**/index_partial_write_ops.js
+  - jstests/core/**/indexa.js # No explicit check for failed command.
+  - jstests/core/**/indexes_multiple_commands.js
+  - jstests/core/**/js2.js
   - jstests/core/json_schema/json_schema.js
-  - jstests/core/max_doc_size.js
-  - jstests/core/mr_bigobject.js
-  - jstests/core/not2.js
-  - jstests/core/null_query_semantics.js
-  - jstests/core/or1.js
-  - jstests/core/or2.js
-  - jstests/core/or3.js
-  - jstests/core/ord.js
-  - jstests/core/orj.js
-  - jstests/core/projection_expr_mod.js
-  - jstests/core/ref.js
-  - jstests/core/ref4.js
-  - jstests/core/regex_limit.js
-  - jstests/core/remove_undefined.js
-  - jstests/core/set7.js
-  - jstests/core/sortb.js
-  - jstests/core/sortf.js
-  - jstests/core/sortg.js
-  - jstests/core/sortj.js
-  - jstests/core/sort_with_meta_operator.js
-  - jstests/core/tailable_skip_limit.js
-  - jstests/core/type_array.js
-  - jstests/core/uniqueness.js
-  - jstests/core/unset2.js
-  - jstests/core/update_addToSet.js
-  - jstests/core/update_array_offset_positional.js
-  - jstests/core/update_find_and_modify_id.js
-  - jstests/core/update_modifier_pop.js
-  - jstests/core/updateh.js
+  - jstests/core/**/max_doc_size.js
+  - jstests/core/**/mr_bigobject.js
+  - jstests/core/**/not2.js
+  - jstests/core/**/null_query_semantics.js
+  - jstests/core/**/or1.js
+  - jstests/core/**/or2.js
+  - jstests/core/**/or3.js
+  - jstests/core/**/ord.js
+  - jstests/core/**/orj.js
+  - jstests/core/**/projection_expr_mod.js
+  - jstests/core/**/ref.js
+  - jstests/core/**/ref4.js
+  - jstests/core/**/regex_limit.js
+  - jstests/core/**/remove_undefined.js
+  - jstests/core/**/set7.js
+  - jstests/core/**/sortb.js
+  - jstests/core/**/sortf.js
+  - jstests/core/**/sortg.js
+  - jstests/core/**/sortj.js
+  - jstests/core/**/sort_with_meta_operator.js
+  - jstests/core/**/tailable_skip_limit.js
+  - jstests/core/**/type_array.js
+  - jstests/core/**/uniqueness.js
+  - jstests/core/**/unset2.js
+  - jstests/core/**/update_addToSet.js
+  - jstests/core/**/update_array_offset_positional.js
+  - jstests/core/**/update_find_and_modify_id.js
+  - jstests/core/**/update_modifier_pop.js
+  - jstests/core/**/updateh.js
 
   # Reads from system.views.
   - jstests/core/views/views_drop.js
@@ -95,26 +95,26 @@ selector:
   ##
 
   # explain (requires read concern local)
-  - jstests/core/agg_hint.js
-  - jstests/core/and.js
-  - jstests/core/collation.js
-  - jstests/core/distinct_multikey_dotted_path.js
-  - jstests/core/distinct_with_hashed_index.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/optimized_match_explain.js
-  - jstests/core/sort_array.js
+  - jstests/core/**/agg_hint.js
+  - jstests/core/**/and.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/distinct_multikey_dotted_path.js
+  - jstests/core/**/distinct_with_hashed_index.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/optimized_match_explain.js
+  - jstests/core/**/sort_array.js
   - jstests/core/views/views_collation.js
-  - jstests/core/wildcard_index_count.js
-  - jstests/core/explain_server_params.js
+  - jstests/core/**/wildcard_index_count.js
+  - jstests/core/**/explain_server_params.js
 
   # $listSessions
-  - jstests/core/list_all_local_sessions.js
-  - jstests/core/list_all_sessions.js
-  - jstests/core/list_sessions.js
+  - jstests/core/**/list_all_local_sessions.js
+  - jstests/core/**/list_all_sessions.js
+  - jstests/core/**/list_sessions.js
 
   # $indexStats
-  - jstests/core/index_stats.js
+  - jstests/core/**/index_stats.js
 
   # $collStats
   - jstests/core/views/views_coll_stats.js
@@ -122,25 +122,25 @@ selector:
   # Errors expected to happen in tests, which can cause transactions to get aborted.
   # So when the test tries to inspect the documents it can be out of sync (relative
   # to test run without multi statement transactions).
-  - jstests/core/doc_validation.js
-  - jstests/core/doc_validation_options.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/insert_illegal_doc.js
-  - jstests/core/positional_projection.js
-  - jstests/core/push_sort.js
-  - jstests/core/update_dbref.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/doc_validation_options.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/insert_illegal_doc.js
+  - jstests/core/**/positional_projection.js
+  - jstests/core/**/push_sort.js
+  - jstests/core/**/update_dbref.js
 
   # Trick for bypassing mongo shell validation in the test doesn't work because txn_override
   # retry logic will hit the shell validation.
-  - jstests/core/invalid_db_name.js
+  - jstests/core/**/invalid_db_name.js
 
   # Multiple writes in a txn, some of which fail because the collection doesn't exist.
   # We create the collection and retry the last write, but previous writes would have
   # still failed.
-  - jstests/core/dbref1.js
-  - jstests/core/dbref2.js
-  - jstests/core/ref3.js
-  - jstests/core/update3.js
+  - jstests/core/**/dbref1.js
+  - jstests/core/**/dbref2.js
+  - jstests/core/**/ref3.js
+  - jstests/core/**/update3.js
 
   ##
   ## Error: Unable to acquire lock within a max lock request timeout of '0ms' milliseconds
@@ -154,69 +154,69 @@ selector:
   ##
 
   # SERVER-34772 Tailable Cursors are not allowed with snapshot readconcern.
-  - jstests/core/awaitdata_getmore_cmd.js
-  - jstests/core/getmore_cmd_maxtimems.js
-  - jstests/core/tailable_cursor_invalidation.js
-  - jstests/core/tailable_getmore_batch_size.js
+  - jstests/core/**/awaitdata_getmore_cmd.js
+  - jstests/core/**/getmore_cmd_maxtimems.js
+  - jstests/core/**/tailable_cursor_invalidation.js
+  - jstests/core/**/tailable_getmore_batch_size.js
 
   # Expects collection to not have been created
-  - jstests/core/insert_id_undefined.js
+  - jstests/core/**/insert_id_undefined.js
 
   # Creates sessions explicitly, resulting in txns being run through different sessions
   # using a single txnNumber.
   - jstests/core/views/views_all_commands.js
 
   # Fails with implicit sessions because it will use multiple sessions on the same Mongo connection.
-  - jstests/core/dropdb.js
+  - jstests/core/**/dropdb.js
 
   # Committing a transaction when the server is fsync locked fails.
-  - jstests/core/fsync.js
+  - jstests/core/**/fsync.js
 
   # Expects legacy errors ($err).
-  - jstests/core/constructors.js
+  - jstests/core/**/constructors.js
 
   # txn interrupted by command outside of txn before getMore runs.
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/drop3.js
-  - jstests/core/geo_s2cursorlimitskip.js
-  - jstests/core/getmore_invalidated_cursors.js
-  - jstests/core/getmore_invalidated_documents.js
-  - jstests/core/kill_cursors.js
-  - jstests/core/list_indexes.js
-  - jstests/core/list_indexes_invalidation.js
-  - jstests/core/list_namespaces_invalidation.js
-  - jstests/core/oro.js
-  - jstests/core/sort_with_update_between_getmores.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/drop3.js
+  - jstests/core/**/geo_s2cursorlimitskip.js
+  - jstests/core/**/getmore_invalidated_cursors.js
+  - jstests/core/**/getmore_invalidated_documents.js
+  - jstests/core/**/kill_cursors.js
+  - jstests/core/**/list_indexes.js
+  - jstests/core/**/list_indexes_invalidation.js
+  - jstests/core/**/list_namespaces_invalidation.js
+  - jstests/core/**/oro.js
+  - jstests/core/**/sort_with_update_between_getmores.js
 
   # Parallel Shell - we do not signal the override to end a txn when a parallel shell closes.
-  - jstests/core/compact_keeps_indexes.js
-  - jstests/core/count10.js
-  - jstests/core/count_plan_summary.js
-  - jstests/core/coveredIndex3.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/distinct3.js
-  - jstests/core/find_and_modify_concurrent_update.js
-  - jstests/core/geo_update_btree.js
-  - jstests/core/killop_drop_collection.js
-  - jstests/core/loadserverscripts.js
-  - jstests/core/mr_killop.js
-  - jstests/core/removeb.js
-  - jstests/core/removec.js
-  - jstests/core/shellstartparallel.js
-  - jstests/core/updatef.js
+  - jstests/core/**/compact_keeps_indexes.js
+  - jstests/core/**/count10.js
+  - jstests/core/**/count_plan_summary.js
+  - jstests/core/**/coveredIndex3.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/distinct3.js
+  - jstests/core/**/find_and_modify_concurrent_update.js
+  - jstests/core/**/geo_update_btree.js
+  - jstests/core/**/killop_drop_collection.js
+  - jstests/core/**/loadserverscripts.js
+  - jstests/core/**/mr_killop.js
+  - jstests/core/**/removeb.js
+  - jstests/core/**/removec.js
+  - jstests/core/**/shellstartparallel.js
+  - jstests/core/**/updatef.js
 
   # Command expects to see result from parallel operation.
   # E.g. Suppose the following sequence of events: op1, join() op2 in parallel shell, op3.
   # op3 will still be using the snapshot from op1, and not see op2 at all.
-  - jstests/core/bench_test1.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/cursora.js
+  - jstests/core/**/bench_test1.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/cursora.js
 
   # Does not support tojson of command objects.
-  - jstests/core/SERVER-23626.js
+  - jstests/core/**/SERVER-23626.js
 
   # "The 'got' response is overriden which causes assertion failures."
-  - jstests/core/index_key_expression.js
+  - jstests/core/**/index_key_expression.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml
index a080520293b..44a37f7187d 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml
@@ -21,89 +21,89 @@ selector:
 
   # This test runs createIndexes commands without asserting they succeed and depends on a particular
   # index to exist.
-  - jstests/core/index_many2.js
+  - jstests/core/**/index_many2.js
 
   #
   # From retryable writes jscore stepdown passthrough
   #
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   #
   # Denylists specific to this suite
   #
 
-  - jstests/core/api_version_parameters.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/bypass_doc_validation.js
-  - jstests/core/collation.js
-  - jstests/core/command_json_schema_field.js
-  - jstests/core/command_let_variables.js
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/disallow_system_views_user_writes.js
-  - jstests/core/doc_validation.js
-  - jstests/core/explain_includes_command.js
-  - jstests/core/explain_multi_plan.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/explain_uuid.js
-  - jstests/core/expr.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/index_stats.js
+  - jstests/core/**/api_version_parameters.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/bypass_doc_validation.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/command_json_schema_field.js
+  - jstests/core/**/command_let_variables.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/disallow_system_views_user_writes.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/explain_includes_command.js
+  - jstests/core/**/explain_multi_plan.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/explain_uuid.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/index_stats.js
   - jstests/core/json_schema/misc_validation.js
-  - jstests/core/noop_writes.js
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/profile_mapreduce.js
-  - jstests/core/sortl.js
-  - jstests/core/system_profile.js
-  - jstests/core/top.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_pipeline_shell_helpers.js
-  - jstests/core/verify_update_mods.js
+  - jstests/core/**/noop_writes.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/profile_mapreduce.js
+  - jstests/core/**/sortl.js
+  - jstests/core/**/system_profile.js
+  - jstests/core/**/top.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_pipeline_shell_helpers.js
+  - jstests/core/**/verify_update_mods.js
   - jstests/core/views/invalid_system_views.js
   - jstests/core/views/views_all_commands.js
   exclude_with_any_tags:
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml
index 1b6577beb2e..b53d63b4b48 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml
@@ -21,89 +21,89 @@ selector:
 
   # This test runs createIndexes commands without asserting they succeed and depends on a particular
   # index to exist.
-  - jstests/core/index_many2.js
+  - jstests/core/**/index_many2.js
 
   #
   # From retryable writes jscore stepdown passthrough
   #
 
   # No-op retries are not ignored by top, the profiler, or opcount.
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile2.js
-  - jstests/core/profile3.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/top.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile2.js
+  - jstests/core/**/profile3.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/top.js
   - jstests/core/views/views_stats.js
 
   # TODO SERVER-31242: findAndModify no-op retry should respect the fields option.
-  - jstests/core/crud_api.js
-  - jstests/core/find_and_modify.js
-  - jstests/core/find_and_modify2.js
-  - jstests/core/find_and_modify_server6865.js
-  - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
+  - jstests/core/**/crud_api.js
+  - jstests/core/**/find_and_modify.js
+  - jstests/core/**/find_and_modify2.js
+  - jstests/core/**/find_and_modify_server6865.js
+  - jstests/core/**/fts_find_and_modify.js
+  - jstests/core/**/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
-  - jstests/core/currentop.js
-  - jstests/core/fsync.js
-  - jstests/core/killop_drop_collection.js
+  - jstests/core/**/currentop.js
+  - jstests/core/**/fsync.js
+  - jstests/core/**/killop_drop_collection.js
 
   # Expect drops/creates to fail or have a certain response:
-  - jstests/core/explain_upsert.js
-  - jstests/core/indexes_multiple_commands.js
+  - jstests/core/**/explain_upsert.js
+  - jstests/core/**/indexes_multiple_commands.js
 
   # Expect certain responses, but retries of successfully completed commands may return
   # different values:
-  - jstests/core/create_indexes.js
-  - jstests/core/objid5.js
+  - jstests/core/**/create_indexes.js
+  - jstests/core/**/objid5.js
 
   # Expect results to return in a certain order, secondaries may apply ops out of order.
-  - jstests/core/coveredIndex1.js
-  - jstests/core/sortc.js
+  - jstests/core/**/coveredIndex1.js
+  - jstests/core/**/sortc.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
-  - jstests/core/shell_connection_strings.js
+  - jstests/core/**/shell_connection_strings.js
 
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
-  - jstests/core/connection_string_validation.js # Does not expect a replica set connection string.
-  - jstests/core/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
-  - jstests/core/list_collections_filter.js # Temporary collections are dropped on failover.
-  - jstests/core/startup_log.js # Checks pid, which is different on each server.
+  - jstests/core/**/bench_test*.js # benchRun() used for writes
+  - jstests/core/**/benchrun_pipeline_updates.js # benchRun() used for writes
+  - jstests/core/**/connection_string_validation.js # Does not expect a replica set connection string.
+  - jstests/core/**/explain_large_bounds.js # Stepdown can timeout waiting for global lock.
+  - jstests/core/**/list_collections_filter.js # Temporary collections are dropped on failover.
+  - jstests/core/**/startup_log.js # Checks pid, which is different on each server.
 
   #
   # Denylists specific to this suite
   #
 
-  - jstests/core/api_version_parameters.js
-  - jstests/core/benchrun_pipeline_updates.js
-  - jstests/core/bypass_doc_validation.js
-  - jstests/core/collation.js
-  - jstests/core/command_json_schema_field.js
-  - jstests/core/command_let_variables.js
-  - jstests/core/commands_namespace_parsing.js
-  - jstests/core/crud_ops_do_not_throw_locktimeout.js
-  - jstests/core/disallow_system_views_user_writes.js
-  - jstests/core/doc_validation.js
-  - jstests/core/explain_includes_command.js
-  - jstests/core/explain_multi_plan.js
-  - jstests/core/explain_shell_helpers.js
-  - jstests/core/explain_uuid.js
-  - jstests/core/expr.js
-  - jstests/core/field_name_validation.js
-  - jstests/core/index_partial_read_ops.js
-  - jstests/core/index_stats.js
+  - jstests/core/**/api_version_parameters.js
+  - jstests/core/**/benchrun_pipeline_updates.js
+  - jstests/core/**/bypass_doc_validation.js
+  - jstests/core/**/collation.js
+  - jstests/core/**/command_json_schema_field.js
+  - jstests/core/**/command_let_variables.js
+  - jstests/core/**/commands_namespace_parsing.js
+  - jstests/core/**/crud_ops_do_not_throw_locktimeout.js
+  - jstests/core/**/disallow_system_views_user_writes.js
+  - jstests/core/**/doc_validation.js
+  - jstests/core/**/explain_includes_command.js
+  - jstests/core/**/explain_multi_plan.js
+  - jstests/core/**/explain_shell_helpers.js
+  - jstests/core/**/explain_uuid.js
+  - jstests/core/**/expr.js
+  - jstests/core/**/field_name_validation.js
+  - jstests/core/**/index_partial_read_ops.js
+  - jstests/core/**/index_stats.js
   - jstests/core/json_schema/misc_validation.js
-  - jstests/core/noop_writes.js
-  - jstests/core/operation_latency_histogram.js
-  - jstests/core/profile_findandmodify.js
-  - jstests/core/profile_mapreduce.js
-  - jstests/core/sortl.js
-  - jstests/core/system_profile.js
-  - jstests/core/top.js
-  - jstests/core/update_arrayFilters.js
-  - jstests/core/update_pipeline_shell_helpers.js
-  - jstests/core/verify_update_mods.js
+  - jstests/core/**/noop_writes.js
+  - jstests/core/**/operation_latency_histogram.js
+  - jstests/core/**/profile_findandmodify.js
+  - jstests/core/**/profile_mapreduce.js
+  - jstests/core/**/sortl.js
+  - jstests/core/**/system_profile.js
+  - jstests/core/**/top.js
+  - jstests/core/**/update_arrayFilters.js
+  - jstests/core/**/update_pipeline_shell_helpers.js
+  - jstests/core/**/verify_update_mods.js
   - jstests/core/views/invalid_system_views.js
   - jstests/core/views/views_all_commands.js
   exclude_with_any_tags:
diff --git a/buildscripts/resmokeconfig/suites/write_concern_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/write_concern_majority_passthrough.yml
index 1b38156d963..1ff025d34f7 100644
--- a/buildscripts/resmokeconfig/suites/write_concern_majority_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/write_concern_majority_passthrough.yml
@@ -8,7 +8,7 @@ selector:
   - jstests/core/txns/**/*.js
   # The shellkillop.js test spawns a parallel shell without using startParallelShell() and therefore
   # doesn't inherit the w="majority" write concern when performing its writes.
-  - jstests/core/shellkillop.js
+  - jstests/core/**/shellkillop.js
   exclude_with_any_tags:
   - assumes_standalone_mongod
   ##
diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml
index 1a606eceea6..9206172af00 100644
--- a/etc/backports_required_for_multiversion_tests.yml
+++ b/etc/backports_required_for_multiversion_tests.yml
@@ -20,7 +20,7 @@
 #
 last-continuous:
   all:
-  - test_file: jstests/core/check_shard_index.js
+  - test_file: jstests/core/administrative/check_shard_index.js
     ticket: SERVER-50792
   - test_file: jstests/sharding/refine_collection_shard_key_basic.js
     ticket: SERVER-50792
@@ -172,17 +172,17 @@ last-continuous:
     ticket: SERVER-63129
   - test_file: jstests/replsets/buildindexes_false_commit_quorum.js
     ticket: SERVER-63531
-  - test_file: jstests/core/in_with_mixed_values.js
+  - test_file: jstests/core/query/in/in_with_mixed_values.js
     ticket: SERVER-64141
   - test_file: jstests/sharding/refine_collection_shard_key_basic.js
     ticket: SERVER-64142
-  - test_file: jstests/core/plan_cache_sbe.js
+  - test_file: jstests/core/query/plan_cache/plan_cache_sbe.js
     ticket: SERVER-64315
   - test_file: jstests/core/sbe/plan_cache_sbe_with_or_queries.js
     ticket: SERVER-64315
   - test_file: jstests/core/sbe_plan_cache_autoparameterize_collscan.js
     ticket: SERVER-64315
-  - test_file: jstests/core/wildcard_index_cached_plans.js
+  - test_file: jstests/core/index/wildcard/wildcard_index_cached_plans.js
     ticket: SERVER-64315
   - test_file: jstests/sharding/resharding_metrics_increment.js
     ticket: SERVER-64395
@@ -216,27 +216,27 @@ last-continuous:
     ticket: SERVER-66078
   - test_file: jstests/replsets/initial_sync_with_partial_transaction.js
     ticket: SERVER-66089
-  - test_file: jstests/core/or_to_in.js
+  - test_file: jstests/core/query/or/or_to_in.js
     ticket: SERVER-66379
-  - test_file: jstests/core/where_multiple_plans.js
+  - test_file: jstests/core/query/where/where_multiple_plans.js
     ticket: SERVER-66389
   - test_file: jstests/sharding/resharding_metrics.js
     ticket: SERVER-66422
   - test_file: jstests/concurrency/fsm_workloads/find_flip_sbe_enabled.js
     ticket: SERVER-66445
-  - test_file: jstests/core/index_stats.js
+  - test_file: jstests/core/index/index_stats.js
     ticket: SERVER-66445
-  - test_file: jstests/core/wildcard_index_cached_plans.js
+  - test_file: jstests/core/index/wildcard/wildcard_index_cached_plans.js
     ticket: SERVER-66445
-  - test_file: jstests/core/index_filter_commands_invalidate_plan_cache_entries.js
+  - test_file: jstests/core/index/index_filter_commands_invalidate_plan_cache_entries.js
     ticket: SERVER-66445
-  - test_file: jstests/core/idhack.js
+  - test_file: jstests/core/query/idhack.js
     ticket: SERVER-66445
   - test_file: jstests/core/sbe/sbe_explain_rejected_plans.js
     ticket: SERVER-66445
-  - test_file: jstests/core/plan_cache_list_shapes.js
+  - test_file: jstests/core/query/plan_cache/plan_cache_list_shapes.js
     ticket: SERVER-66445
-  - test_file: jstests/core/plan_cache_list_plans.js
+  - test_file: jstests/core/query/plan_cache/plan_cache_list_plans.js
     ticket: SERVER-66445
   - test_file: jstests/replsets/dbhash_lock_acquisition.js
     ticket: SERVER-66719
@@ -292,20 +292,20 @@ last-continuous:
     ticket: SERVER-71689
   - test_file: jstests/sharding/hidden_index.js
     ticket: SERVER-71638
-  - test_file: jstests/core/project_with_collation.js
+  - test_file: jstests/core/query/project/project_with_collation.js
     ticket: SERVER-72416
   - test_file: jstests/core/collation.js
     ticket: SERVER-72416
-  - test_file: jstests/core/or_to_in.js
+  - test_file: jstests/core/query/or/or_to_in.js
     ticket: SERVER-72416
   - test_file: src/mongo/db/modules/enterprise/jstests/fcbis/oplog_rollover.js
     ticket: SERVER-72422
   suites: null
 last-lts:
   all:
-  - test_file: jstests/core/null_query_semantics.js
+  - test_file: jstests/core/query/null_query_semantics.js
     ticket: SERVER-21929
-  - test_file: jstests/core/or_to_in.js
+  - test_file: jstests/core/query/or/or_to_in.js
     ticket: SERVER-21929
   - test_file: jstests/aggregation/sources/lookup/lookup_null_semantics.js
     ticket: SERVER-21929
@@ -315,7 +315,7 @@ last-lts:
     ticket: SERVER-37904
   - test_file: jstests/sharding/scaled_collection_stats.js
     ticket: SERVER-43902
-  - test_file: jstests/core/apply_ops_system_dot_views.js
+  - test_file: jstests/core/administrative/apply_ops/apply_ops_system_dot_views.js
     ticket: SERVER-47469
   - test_file: jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js
     ticket: SERVER-47469
@@ -347,7 +347,7 @@ last-lts:
     ticket: SERVER-50640
   - test_file: jstests/sharding/safe_secondary_reads_single_migration_waitForDelete.js
     ticket: SERVER-50640
-  - test_file: jstests/core/check_shard_index.js
+  - test_file: jstests/core/administrative/check_shard_index.js
     ticket: SERVER-50792
   - test_file: jstests/sharding/refine_collection_shard_key_basic.js
     ticket: SERVER-50792
@@ -555,13 +555,13 @@ last-lts:
     ticket: SERVER-63531
   - test_file: jstests/sharding/refine_collection_shard_key_basic.js
     ticket: SERVER-64142
-  - test_file: jstests/core/plan_cache_sbe.js
+  - test_file: jstests/core/query/plan_cache/plan_cache_sbe.js
     ticket: SERVER-64315
   - test_file: jstests/core/sbe/plan_cache_sbe_with_or_queries.js
     ticket: SERVER-64315
   - test_file: jstests/core/sbe_plan_cache_autoparameterize_collscan.js
     ticket: SERVER-64315
-  - test_file: jstests/core/wildcard_index_cached_plans.js
+  - test_file: jstests/core/index/wildcard/wildcard_index_cached_plans.js
     ticket: SERVER-64315
   - test_file: jstests/sharding/resharding_metrics_increment.js
     ticket: SERVER-64395
@@ -593,27 +593,27 @@ last-lts:
     ticket: SERVER-66078
   - test_file: jstests/replsets/initial_sync_with_partial_transaction.js
     ticket: SERVER-66089
-  - test_file: jstests/core/or_to_in.js
+  - test_file: jstests/core/query/or/or_to_in.js
     ticket: SERVER-66379
-  - test_file: jstests/core/where_multiple_plans.js
+  - test_file: jstests/core/query/where/where_multiple_plans.js
     ticket: SERVER-66389
   - test_file: jstests/sharding/resharding_metrics.js
     ticket: SERVER-66422
   - test_file: jstests/concurrency/fsm_workloads/find_flip_sbe_enabled.js
     ticket: SERVER-66445
-  - test_file: jstests/core/index_stats.js
+  - test_file: jstests/core/index/index_stats.js
     ticket: SERVER-66445
-  - test_file: jstests/core/wildcard_index_cached_plans.js
+  - test_file: jstests/core/index/wildcard/wildcard_index_cached_plans.js
     ticket: SERVER-66445
-  - test_file: jstests/core/index_filter_commands_invalidate_plan_cache_entries.js
+  - test_file: jstests/core/index/index_filter_commands_invalidate_plan_cache_entries.js
     ticket: SERVER-66445
-  - test_file: jstests/core/idhack.js
+  - test_file: jstests/core/query/idhack.js
     ticket: SERVER-66445
   - test_file: jstests/core/sbe/sbe_explain_rejected_plans.js
     ticket: SERVER-66445
-  - test_file: jstests/core/plan_cache_list_shapes.js
+  - test_file: jstests/core/query/plan_cache/plan_cache_list_shapes.js
     ticket: SERVER-66445
-  - test_file: jstests/core/plan_cache_list_plans.js
+  - test_file: jstests/core/query/plan_cache/plan_cache_list_plans.js
     ticket: SERVER-66445
   - test_file: jstests/replsets/dbhash_lock_acquisition.js
     ticket: SERVER-66719
@@ -667,11 +667,11 @@ last-lts:
     ticket: SERVER-71689
   - test_file: jstests/sharding/hidden_index.js
     ticket: SERVER-71638
-  - test_file: jstests/core/project_with_collation.js
+  - test_file: jstests/core/query/project/project_with_collation.js
     ticket: SERVER-72416
   - test_file: jstests/core/collation.js
     ticket: SERVER-72416
-  - test_file: jstests/core/or_to_in.js
+  - test_file: jstests/core/query/or/or_to_in.js
     ticket: SERVER-72416
   - test_file: src/mongo/db/modules/enterprise/jstests/fcbis/oplog_rollover.js
     ticket: SERVER-72422
diff --git a/jstests/core/apply_ops1.js b/jstests/core/administrative/apply_ops/apply_ops1.js
index b4218758ab3..b4218758ab3 100644
--- a/jstests/core/apply_ops1.js
+++ b/jstests/core/administrative/apply_ops/apply_ops1.js
diff --git a/jstests/core/apply_ops2.js b/jstests/core/administrative/apply_ops/apply_ops2.js
index a4569bc2acb..a4569bc2acb 100644
--- a/jstests/core/apply_ops2.js
+++ b/jstests/core/administrative/apply_ops/apply_ops2.js
diff --git a/jstests/core/apply_ops_dups.js b/jstests/core/administrative/apply_ops/apply_ops_dups.js
index 013fc839622..013fc839622 100644
--- a/jstests/core/apply_ops_dups.js
+++ b/jstests/core/administrative/apply_ops/apply_ops_dups.js
diff --git a/jstests/core/apply_ops_index_collation.js b/jstests/core/administrative/apply_ops/apply_ops_index_collation.js
index 2eff07059ea..2eff07059ea 100644
--- a/jstests/core/apply_ops_index_collation.js
+++ b/jstests/core/administrative/apply_ops/apply_ops_index_collation.js
diff --git a/jstests/core/apply_ops_invalid_index_spec.js b/jstests/core/administrative/apply_ops/apply_ops_invalid_index_spec.js
index f24f0dfe47f..f24f0dfe47f 100644
--- a/jstests/core/apply_ops_invalid_index_spec.js
+++ b/jstests/core/administrative/apply_ops/apply_ops_invalid_index_spec.js
diff --git a/jstests/core/apply_ops_missing_field.js b/jstests/core/administrative/apply_ops/apply_ops_missing_field.js
index 8f12cfece56..8f12cfece56 100644
--- a/jstests/core/apply_ops_missing_field.js
+++ b/jstests/core/administrative/apply_ops/apply_ops_missing_field.js
diff --git a/jstests/core/apply_ops_system_dot_views.js b/jstests/core/administrative/apply_ops/apply_ops_system_dot_views.js
index b6a9cbc62f0..b6a9cbc62f0 100644
--- a/jstests/core/apply_ops_system_dot_views.js
+++ b/jstests/core/administrative/apply_ops/apply_ops_system_dot_views.js
diff --git a/jstests/core/apply_ops_without_ns.js b/jstests/core/administrative/apply_ops/apply_ops_without_ns.js
index 2979827f034..2979827f034 100644
--- a/jstests/core/apply_ops_without_ns.js
+++ b/jstests/core/administrative/apply_ops/apply_ops_without_ns.js
diff --git a/jstests/core/auth1.js b/jstests/core/administrative/auth1.js
index 7633644c0da..7633644c0da 100644
--- a/jstests/core/auth1.js
+++ b/jstests/core/administrative/auth1.js
diff --git a/jstests/core/auth2.js b/jstests/core/administrative/auth2.js
index eb2b47f696f..eb2b47f696f 100644
--- a/jstests/core/auth2.js
+++ b/jstests/core/administrative/auth2.js
diff --git a/jstests/core/automation_setparameter.js b/jstests/core/administrative/automation_setparameter.js
index 76f1ec72e7d..76f1ec72e7d 100644
--- a/jstests/core/automation_setparameter.js
+++ b/jstests/core/administrative/automation_setparameter.js
diff --git a/jstests/core/builtin_roles_external.js b/jstests/core/administrative/builtin_roles_external.js
index f2b9263cd5d..f2b9263cd5d 100644
--- a/jstests/core/builtin_roles_external.js
+++ b/jstests/core/administrative/builtin_roles_external.js
diff --git a/jstests/core/check_shard_index.js b/jstests/core/administrative/check_shard_index.js
index f6bb9f3ee7a..f6bb9f3ee7a 100644
--- a/jstests/core/check_shard_index.js
+++ b/jstests/core/administrative/check_shard_index.js
diff --git a/jstests/core/cleanup_orphaned.js b/jstests/core/administrative/cleanup_orphaned.js
index e3448599540..e3448599540 100644
--- a/jstests/core/cleanup_orphaned.js
+++ b/jstests/core/administrative/cleanup_orphaned.js
diff --git a/jstests/core/compact_keeps_indexes.js b/jstests/core/administrative/compact_keeps_indexes.js
index 42fad3c07b3..42fad3c07b3 100644
--- a/jstests/core/compact_keeps_indexes.js
+++ b/jstests/core/administrative/compact_keeps_indexes.js
diff --git a/jstests/core/currentop.js b/jstests/core/administrative/current_op/currentop.js
index a59cd53065a..a59cd53065a 100644
--- a/jstests/core/currentop.js
+++ b/jstests/core/administrative/current_op/currentop.js
diff --git a/jstests/core/currentop_cursors.js b/jstests/core/administrative/current_op/currentop_cursors.js
index 2d3608b21ab..2d3608b21ab 100644
--- a/jstests/core/currentop_cursors.js
+++ b/jstests/core/administrative/current_op/currentop_cursors.js
diff --git a/jstests/core/currentop_predicate.js b/jstests/core/administrative/current_op/currentop_predicate.js
index ddda0570f87..ddda0570f87 100644
--- a/jstests/core/currentop_predicate.js
+++ b/jstests/core/administrative/current_op/currentop_predicate.js
diff --git a/jstests/core/currentop_shell.js b/jstests/core/administrative/current_op/currentop_shell.js
index 9d52b4ca75c..9d52b4ca75c 100644
--- a/jstests/core/currentop_shell.js
+++ b/jstests/core/administrative/current_op/currentop_shell.js
diff --git a/jstests/core/currentop_waiting_for_latch.js b/jstests/core/administrative/current_op/currentop_waiting_for_latch.js
index b02f219fe02..b02f219fe02 100644
--- a/jstests/core/currentop_waiting_for_latch.js
+++ b/jstests/core/administrative/current_op/currentop_waiting_for_latch.js
diff --git a/jstests/core/getlog1.js b/jstests/core/administrative/getlog1.js
index a5989e87c75..a5989e87c75 100644
--- a/jstests/core/getlog1.js
+++ b/jstests/core/administrative/getlog1.js
diff --git a/jstests/core/getlog2.js b/jstests/core/administrative/getlog2.js
index 441bebdac4c..441bebdac4c 100644
--- a/jstests/core/getlog2.js
+++ b/jstests/core/administrative/getlog2.js
diff --git a/jstests/core/list_all_local_sessions.js b/jstests/core/administrative/list_all_local_sessions.js
index 434e8ed660c..434e8ed660c 100644
--- a/jstests/core/list_all_local_sessions.js
+++ b/jstests/core/administrative/list_all_local_sessions.js
diff --git a/jstests/core/list_all_sessions.js b/jstests/core/administrative/list_all_sessions.js
index 7ecaefd00f9..7ecaefd00f9 100644
--- a/jstests/core/list_all_sessions.js
+++ b/jstests/core/administrative/list_all_sessions.js
diff --git a/jstests/core/list_sessions.js b/jstests/core/administrative/list_sessions.js
index 18f684ef11d..18f684ef11d 100644
--- a/jstests/core/list_sessions.js
+++ b/jstests/core/administrative/list_sessions.js
diff --git a/jstests/core/profile1.js b/jstests/core/administrative/profile/profile1.js
index d42b49b050c..d42b49b050c 100644
--- a/jstests/core/profile1.js
+++ b/jstests/core/administrative/profile/profile1.js
diff --git a/jstests/core/profile2.js b/jstests/core/administrative/profile/profile2.js
index 16aabb19dcd..16aabb19dcd 100644
--- a/jstests/core/profile2.js
+++ b/jstests/core/administrative/profile/profile2.js
diff --git a/jstests/core/profile3.js b/jstests/core/administrative/profile/profile3.js
index 1e75c08b0c2..1e75c08b0c2 100644
--- a/jstests/core/profile3.js
+++ b/jstests/core/administrative/profile/profile3.js
diff --git a/jstests/core/profile_agg.js b/jstests/core/administrative/profile/profile_agg.js
index c3a163ad81e..c3a163ad81e 100644
--- a/jstests/core/profile_agg.js
+++ b/jstests/core/administrative/profile/profile_agg.js
diff --git a/jstests/core/profile_count.js b/jstests/core/administrative/profile/profile_count.js
index 02a581948c6..02a581948c6 100644
--- a/jstests/core/profile_count.js
+++ b/jstests/core/administrative/profile/profile_count.js
diff --git a/jstests/core/profile_delete.js b/jstests/core/administrative/profile/profile_delete.js
index e10f820ce03..e10f820ce03 100644
--- a/jstests/core/profile_delete.js
+++ b/jstests/core/administrative/profile/profile_delete.js
diff --git a/jstests/core/profile_distinct.js b/jstests/core/administrative/profile/profile_distinct.js
index 86eaf488286..86eaf488286 100644
--- a/jstests/core/profile_distinct.js
+++ b/jstests/core/administrative/profile/profile_distinct.js
diff --git a/jstests/core/profile_find.js b/jstests/core/administrative/profile/profile_find.js
index 4fae247a2bd..4fae247a2bd 100644
--- a/jstests/core/profile_find.js
+++ b/jstests/core/administrative/profile/profile_find.js
diff --git a/jstests/core/profile_findandmodify.js b/jstests/core/administrative/profile/profile_findandmodify.js
index 1ba5a5dc885..1ba5a5dc885 100644
--- a/jstests/core/profile_findandmodify.js
+++ b/jstests/core/administrative/profile/profile_findandmodify.js
diff --git a/jstests/core/profile_getmore.js b/jstests/core/administrative/profile/profile_getmore.js
index eb2a2428e21..eb2a2428e21 100644
--- a/jstests/core/profile_getmore.js
+++ b/jstests/core/administrative/profile/profile_getmore.js
diff --git a/jstests/core/profile_hide_index.js b/jstests/core/administrative/profile/profile_hide_index.js
index 95c5bd0e8a6..95c5bd0e8a6 100644
--- a/jstests/core/profile_hide_index.js
+++ b/jstests/core/administrative/profile/profile_hide_index.js
diff --git a/jstests/core/profile_insert.js b/jstests/core/administrative/profile/profile_insert.js
index 83cc920e200..83cc920e200 100644
--- a/jstests/core/profile_insert.js
+++ b/jstests/core/administrative/profile/profile_insert.js
diff --git a/jstests/core/profile_list_collections.js b/jstests/core/administrative/profile/profile_list_collections.js
index 1d2a40578c9..1d2a40578c9 100644
--- a/jstests/core/profile_list_collections.js
+++ b/jstests/core/administrative/profile/profile_list_collections.js
diff --git a/jstests/core/profile_list_indexes.js b/jstests/core/administrative/profile/profile_list_indexes.js
index 0d9a260e93d..0d9a260e93d 100644
--- a/jstests/core/profile_list_indexes.js
+++ b/jstests/core/administrative/profile/profile_list_indexes.js
diff --git a/jstests/core/profile_mapreduce.js b/jstests/core/administrative/profile/profile_mapreduce.js
index ddad8e50137..ddad8e50137 100644
--- a/jstests/core/profile_mapreduce.js
+++ b/jstests/core/administrative/profile/profile_mapreduce.js
diff --git a/jstests/core/profile_no_such_db.js b/jstests/core/administrative/profile/profile_no_such_db.js
index 141be56b201..141be56b201 100644
--- a/jstests/core/profile_no_such_db.js
+++ b/jstests/core/administrative/profile/profile_no_such_db.js
diff --git a/jstests/core/profile_query_hash.js b/jstests/core/administrative/profile/profile_query_hash.js
index d8ddaf06f36..d8ddaf06f36 100644
--- a/jstests/core/profile_query_hash.js
+++ b/jstests/core/administrative/profile/profile_query_hash.js
diff --git a/jstests/core/profile_sampling.js b/jstests/core/administrative/profile/profile_sampling.js
index 0841c6c7cc5..0841c6c7cc5 100644
--- a/jstests/core/profile_sampling.js
+++ b/jstests/core/administrative/profile/profile_sampling.js
diff --git a/jstests/core/profile_update.js b/jstests/core/administrative/profile/profile_update.js
index bd07ba42251..bd07ba42251 100644
--- a/jstests/core/profile_update.js
+++ b/jstests/core/administrative/profile/profile_update.js
diff --git a/jstests/core/system_profile.js b/jstests/core/administrative/profile/system_profile.js
index ba03b39dbd0..ba03b39dbd0 100644
--- a/jstests/core/system_profile.js
+++ b/jstests/core/administrative/profile/system_profile.js
diff --git a/jstests/core/set_param1.js b/jstests/core/administrative/set_param1.js
index dfe71da85d2..dfe71da85d2 100644
--- a/jstests/core/set_param1.js
+++ b/jstests/core/administrative/set_param1.js
diff --git a/jstests/core/validate_db_metadata_command.js b/jstests/core/administrative/validate_db_metadata_command.js
index 5590dd10147..5590dd10147 100644
--- a/jstests/core/validate_db_metadata_command.js
+++ b/jstests/core/administrative/validate_db_metadata_command.js
diff --git a/jstests/core/api_params_getmore.js b/jstests/core/api/api_params_getmore.js
index 1b229631f20..1b229631f20 100644
--- a/jstests/core/api_params_getmore.js
+++ b/jstests/core/api/api_params_getmore.js
diff --git a/jstests/core/api_version_create.js b/jstests/core/api/api_version_create.js
index e3a4ed00f66..e3a4ed00f66 100644
--- a/jstests/core/api_version_create.js
+++ b/jstests/core/api/api_version_create.js
diff --git a/jstests/core/api_version_find_and_modify.js b/jstests/core/api/api_version_find_and_modify.js
index 78e9a53a898..78e9a53a898 100644
--- a/jstests/core/api_version_find_and_modify.js
+++ b/jstests/core/api/api_version_find_and_modify.js
diff --git a/jstests/core/api_version_new_50_language_features.js b/jstests/core/api/api_version_new_50_language_features.js
index 14c4f7e6aa8..14c4f7e6aa8 100644
--- a/jstests/core/api_version_new_50_language_features.js
+++ b/jstests/core/api/api_version_new_50_language_features.js
diff --git a/jstests/core/api_version_new_51_language_features.js b/jstests/core/api/api_version_new_51_language_features.js
index 48e73d7e052..48e73d7e052 100644
--- a/jstests/core/api_version_new_51_language_features.js
+++ b/jstests/core/api/api_version_new_51_language_features.js
diff --git a/jstests/core/api_version_new_52_language_features.js b/jstests/core/api/api_version_new_52_language_features.js
index b1ab2107fbf..b1ab2107fbf 100644
--- a/jstests/core/api_version_new_52_language_features.js
+++ b/jstests/core/api/api_version_new_52_language_features.js
diff --git a/jstests/core/api_version_parameters.js b/jstests/core/api/api_version_parameters.js
index cb397395d7f..cb397395d7f 100644
--- a/jstests/core/api_version_parameters.js
+++ b/jstests/core/api/api_version_parameters.js
diff --git a/jstests/core/api_version_pipeline_stages.js b/jstests/core/api/api_version_pipeline_stages.js
index c9772e4fa0c..c9772e4fa0c 100644
--- a/jstests/core/api_version_pipeline_stages.js
+++ b/jstests/core/api/api_version_pipeline_stages.js
diff --git a/jstests/core/api_version_test_expression.js b/jstests/core/api/api_version_test_expression.js
index 41bbd9c0402..41bbd9c0402 100644
--- a/jstests/core/api_version_test_expression.js
+++ b/jstests/core/api/api_version_test_expression.js
diff --git a/jstests/core/api_version_unstable_fields.js b/jstests/core/api/api_version_unstable_fields.js
index d926fce1c58..d926fce1c58 100644
--- a/jstests/core/api_version_unstable_fields.js
+++ b/jstests/core/api/api_version_unstable_fields.js
diff --git a/jstests/core/api_version_unstable_indexes.js b/jstests/core/api/api_version_unstable_indexes.js
index 78e5ad3ac81..78e5ad3ac81 100644
--- a/jstests/core/api_version_unstable_indexes.js
+++ b/jstests/core/api/api_version_unstable_indexes.js
diff --git a/jstests/core/apitest_db.js b/jstests/core/api/apitest_db.js
index 805e2c8f990..805e2c8f990 100644
--- a/jstests/core/apitest_db.js
+++ b/jstests/core/api/apitest_db.js
diff --git a/jstests/core/apitest_db_profile_level.js b/jstests/core/api/apitest_db_profile_level.js
index 31e0c36eb88..31e0c36eb88 100644
--- a/jstests/core/apitest_db_profile_level.js
+++ b/jstests/core/api/apitest_db_profile_level.js
diff --git a/jstests/core/apitest_dbcollection.js b/jstests/core/api/apitest_dbcollection.js
index 8a2c426b59a..8a2c426b59a 100644
--- a/jstests/core/apitest_dbcollection.js
+++ b/jstests/core/api/apitest_dbcollection.js
diff --git a/jstests/core/capped.js b/jstests/core/capped/capped.js
index 6c62ba75560..6c62ba75560 100644
--- a/jstests/core/capped.js
+++ b/jstests/core/capped/capped.js
diff --git a/jstests/core/capped1.js b/jstests/core/capped/capped1.js
index df9b12ddf89..df9b12ddf89 100644
--- a/jstests/core/capped1.js
+++ b/jstests/core/capped/capped1.js
diff --git a/jstests/core/capped5.js b/jstests/core/capped/capped5.js
index a276baf043d..a276baf043d 100644
--- a/jstests/core/capped5.js
+++ b/jstests/core/capped/capped5.js
diff --git a/jstests/core/capped_empty.js b/jstests/core/capped/capped_empty.js
index e0515967ca8..e0515967ca8 100644
--- a/jstests/core/capped_empty.js
+++ b/jstests/core/capped/capped_empty.js
diff --git a/jstests/core/capped_large_docs.js b/jstests/core/capped/capped_large_docs.js
index f32a3e33389..f32a3e33389 100644
--- a/jstests/core/capped_large_docs.js
+++ b/jstests/core/capped/capped_large_docs.js
diff --git a/jstests/core/capped_max1.js b/jstests/core/capped/capped_max1.js
index 62ac9e92b91..62ac9e92b91 100644
--- a/jstests/core/capped_max1.js
+++ b/jstests/core/capped/capped_max1.js
diff --git a/jstests/core/capped_queries_and_id_index.js b/jstests/core/capped/capped_queries_and_id_index.js
index 20dee23035e..20dee23035e 100644
--- a/jstests/core/capped_queries_and_id_index.js
+++ b/jstests/core/capped/capped_queries_and_id_index.js
diff --git a/jstests/core/capped_resize.js b/jstests/core/capped/capped_resize.js
index fc6d7f15c64..fc6d7f15c64 100644
--- a/jstests/core/capped_resize.js
+++ b/jstests/core/capped/capped_resize.js
diff --git a/jstests/core/capped_update.js b/jstests/core/capped/capped_update.js
index 70c5a67b63d..70c5a67b63d 100644
--- a/jstests/core/capped_update.js
+++ b/jstests/core/capped/capped_update.js
diff --git a/jstests/core/capped_upsert.js b/jstests/core/capped/capped_upsert.js
index 38f5afe3b24..38f5afe3b24 100644
--- a/jstests/core/capped_upsert.js
+++ b/jstests/core/capped/capped_upsert.js
diff --git a/jstests/core/cappeda.js b/jstests/core/capped/cappeda.js
index 3ec0074eefe..3ec0074eefe 100644
--- a/jstests/core/cappeda.js
+++ b/jstests/core/capped/cappeda.js
diff --git a/jstests/core/list_catalog.js b/jstests/core/catalog/list_catalog.js
index 163e312cef0..163e312cef0 100644
--- a/jstests/core/list_catalog.js
+++ b/jstests/core/catalog/list_catalog.js
diff --git a/jstests/core/list_collections1.js b/jstests/core/catalog/list_collections1.js
index 27f106fb677..27f106fb677 100644
--- a/jstests/core/list_collections1.js
+++ b/jstests/core/catalog/list_collections1.js
diff --git a/jstests/core/list_collections_filter.js b/jstests/core/catalog/list_collections_filter.js
index 1341e60d890..1341e60d890 100644
--- a/jstests/core/list_collections_filter.js
+++ b/jstests/core/catalog/list_collections_filter.js
diff --git a/jstests/core/list_collections_name_only.js b/jstests/core/catalog/list_collections_name_only.js
index bd7bb7e249d..bd7bb7e249d 100644
--- a/jstests/core/list_collections_name_only.js
+++ b/jstests/core/catalog/list_collections_name_only.js
diff --git a/jstests/core/list_collections_no_views.js b/jstests/core/catalog/list_collections_no_views.js
index b0dc8c777c5..b0dc8c777c5 100644
--- a/jstests/core/list_collections_no_views.js
+++ b/jstests/core/catalog/list_collections_no_views.js
diff --git a/jstests/core/list_databases.js b/jstests/core/catalog/list_databases.js
index 0e92c9dfeab..0e92c9dfeab 100644
--- a/jstests/core/list_databases.js
+++ b/jstests/core/catalog/list_databases.js
diff --git a/jstests/core/list_indexes.js b/jstests/core/catalog/list_indexes.js
index b4e5e886b7c..b4e5e886b7c 100644
--- a/jstests/core/list_indexes.js
+++ b/jstests/core/catalog/list_indexes.js
diff --git a/jstests/core/list_indexes_invalid.js b/jstests/core/catalog/list_indexes_invalid.js
index 7b73a4278ce..7b73a4278ce 100644
--- a/jstests/core/list_indexes_invalid.js
+++ b/jstests/core/catalog/list_indexes_invalid.js
diff --git a/jstests/core/list_indexes_invalidation.js b/jstests/core/catalog/list_indexes_invalidation.js
index 74afd3327bd..74afd3327bd 100644
--- a/jstests/core/list_indexes_invalidation.js
+++ b/jstests/core/catalog/list_indexes_invalidation.js
diff --git a/jstests/core/list_indexes_non_existent_ns.js b/jstests/core/catalog/list_indexes_non_existent_ns.js
index 11a82746b06..11a82746b06 100644
--- a/jstests/core/list_indexes_non_existent_ns.js
+++ b/jstests/core/catalog/list_indexes_non_existent_ns.js
diff --git a/jstests/core/clustered_collection_basic.js b/jstests/core/clustered/clustered_collection_basic.js
index 52775d02c6a..52775d02c6a 100644
--- a/jstests/core/clustered_collection_basic.js
+++ b/jstests/core/clustered/clustered_collection_basic.js
diff --git a/jstests/core/clustered_collection_bounded_scan.js b/jstests/core/clustered/clustered_collection_bounded_scan.js
index 8a6a0a1a9d5..8a6a0a1a9d5 100644
--- a/jstests/core/clustered_collection_bounded_scan.js
+++ b/jstests/core/clustered/clustered_collection_bounded_scan.js
diff --git a/jstests/core/clustered_collection_collation.js b/jstests/core/clustered/clustered_collection_collation.js
index b09389e7114..b09389e7114 100644
--- a/jstests/core/clustered_collection_collation.js
+++ b/jstests/core/clustered/clustered_collection_collation.js
diff --git a/jstests/core/clustered_collection_create_index_clustered.js b/jstests/core/clustered/clustered_collection_create_index_clustered.js
index ac98d05ea90..ac98d05ea90 100644
--- a/jstests/core/clustered_collection_create_index_clustered.js
+++ b/jstests/core/clustered/clustered_collection_create_index_clustered.js
diff --git a/jstests/core/clustered_collection_creation.js b/jstests/core/clustered/clustered_collection_creation.js
index 7481f1876e9..7481f1876e9 100644
--- a/jstests/core/clustered_collection_creation.js
+++ b/jstests/core/clustered/clustered_collection_creation.js
diff --git a/jstests/core/clustered_collection_hint.js b/jstests/core/clustered/clustered_collection_hint.js
index ba7820b2463..ba7820b2463 100644
--- a/jstests/core/clustered_collection_hint.js
+++ b/jstests/core/clustered/clustered_collection_hint.js
diff --git a/jstests/core/column_scan_skip_row_store_projection.js b/jstests/core/columnstore/column_scan_skip_row_store_projection.js
index b69e515d7ef..b69e515d7ef 100644
--- a/jstests/core/column_scan_skip_row_store_projection.js
+++ b/jstests/core/columnstore/column_scan_skip_row_store_projection.js
diff --git a/jstests/core/column_store_index_compression.js b/jstests/core/columnstore/column_store_index_compression.js
index c66c12abef0..c66c12abef0 100644
--- a/jstests/core/column_store_index_compression.js
+++ b/jstests/core/columnstore/column_store_index_compression.js
diff --git a/jstests/core/columnstore_eligibility.js b/jstests/core/columnstore/columnstore_eligibility.js
index c65f4c50eff..c65f4c50eff 100644
--- a/jstests/core/columnstore_eligibility.js
+++ b/jstests/core/columnstore/columnstore_eligibility.js
diff --git a/jstests/core/columnstore_index.js b/jstests/core/columnstore/columnstore_index.js
index 2dd886e3167..2dd886e3167 100644
--- a/jstests/core/columnstore_index.js
+++ b/jstests/core/columnstore/columnstore_index.js
diff --git a/jstests/core/columnstore_index_correctness.js b/jstests/core/columnstore/columnstore_index_correctness.js
index 4f28432aa07..4f28432aa07 100644
--- a/jstests/core/columnstore_index_correctness.js
+++ b/jstests/core/columnstore/columnstore_index_correctness.js
diff --git a/jstests/core/columnstore_index_per_path_filters.js b/jstests/core/columnstore/columnstore_index_per_path_filters.js
index 0c81532ea79..0c81532ea79 100644
--- a/jstests/core/columnstore_index_per_path_filters.js
+++ b/jstests/core/columnstore/columnstore_index_per_path_filters.js
diff --git a/jstests/core/columnstore_large_array_index_correctness.js b/jstests/core/columnstore/columnstore_large_array_index_correctness.js
index 14b9d948a6f..14b9d948a6f 100644
--- a/jstests/core/columnstore_large_array_index_correctness.js
+++ b/jstests/core/columnstore/columnstore_large_array_index_correctness.js
diff --git a/jstests/core/columnstore_validindex.js b/jstests/core/columnstore/columnstore_validindex.js
index 882a21efda0..882a21efda0 100644
--- a/jstests/core/columnstore_validindex.js
+++ b/jstests/core/columnstore/columnstore_validindex.js
diff --git a/jstests/core/background_index_multikey.js b/jstests/core/ddl/background_index_multikey.js
index 1565266852e..1565266852e 100644
--- a/jstests/core/background_index_multikey.js
+++ b/jstests/core/ddl/background_index_multikey.js
diff --git a/jstests/core/background_unique_indexes.js b/jstests/core/ddl/background_unique_indexes.js
index fb1d0d9aee7..fb1d0d9aee7 100644
--- a/jstests/core/background_unique_indexes.js
+++ b/jstests/core/ddl/background_unique_indexes.js
diff --git a/jstests/core/bad_index_plugin.js b/jstests/core/ddl/bad_index_plugin.js
index c9cd549cc03..c9cd549cc03 100644
--- a/jstests/core/bad_index_plugin.js
+++ b/jstests/core/ddl/bad_index_plugin.js
diff --git a/jstests/core/capped_convertToCapped1.js b/jstests/core/ddl/capped_convertToCapped1.js
index 137705c8661..137705c8661 100644
--- a/jstests/core/capped_convertToCapped1.js
+++ b/jstests/core/ddl/capped_convertToCapped1.js
diff --git a/jstests/core/clone_as_capped_nonexistant.js b/jstests/core/ddl/clone_as_capped_nonexistant.js
index ce4b531b8e8..ce4b531b8e8 100644
--- a/jstests/core/clone_as_capped_nonexistant.js
+++ b/jstests/core/ddl/clone_as_capped_nonexistant.js
diff --git a/jstests/core/collMod_index_invalid_option.js b/jstests/core/ddl/collMod_index_invalid_option.js
index ca8d5e71d0c..ca8d5e71d0c 100644
--- a/jstests/core/collMod_index_invalid_option.js
+++ b/jstests/core/ddl/collMod_index_invalid_option.js
diff --git a/jstests/core/collation_convert_to_capped.js b/jstests/core/ddl/collation_convert_to_capped.js
index 63d5d6f7e8a..63d5d6f7e8a 100644
--- a/jstests/core/collation_convert_to_capped.js
+++ b/jstests/core/ddl/collation_convert_to_capped.js
diff --git a/jstests/core/collection_uuid_coll_mod.js b/jstests/core/ddl/collection_uuid_coll_mod.js
index 218a758c0b3..218a758c0b3 100644
--- a/jstests/core/collection_uuid_coll_mod.js
+++ b/jstests/core/ddl/collection_uuid_coll_mod.js
diff --git a/jstests/core/collection_uuid_drop.js b/jstests/core/ddl/collection_uuid_drop.js
index a3465795292..a3465795292 100644
--- a/jstests/core/collection_uuid_drop.js
+++ b/jstests/core/ddl/collection_uuid_drop.js
diff --git a/jstests/core/collection_uuid_index_commands.js b/jstests/core/ddl/collection_uuid_index_commands.js
index 85c9f0a9124..85c9f0a9124 100644
--- a/jstests/core/collection_uuid_index_commands.js
+++ b/jstests/core/ddl/collection_uuid_index_commands.js
diff --git a/jstests/core/collection_uuid_rename_collection.js b/jstests/core/ddl/collection_uuid_rename_collection.js
index bc294fd7aab..bc294fd7aab 100644
--- a/jstests/core/collection_uuid_rename_collection.js
+++ b/jstests/core/ddl/collection_uuid_rename_collection.js
diff --git a/jstests/core/collmod.js b/jstests/core/ddl/collmod.js
index 6632e619799..6632e619799 100644
--- a/jstests/core/collmod.js
+++ b/jstests/core/ddl/collmod.js
diff --git a/jstests/core/collmod_bad_spec.js b/jstests/core/ddl/collmod_bad_spec.js
index c0519f375f5..c0519f375f5 100644
--- a/jstests/core/collmod_bad_spec.js
+++ b/jstests/core/ddl/collmod_bad_spec.js
diff --git a/jstests/core/collmod_convert_index_uniqueness.js b/jstests/core/ddl/collmod_convert_index_uniqueness.js
index ab2d8237788..ab2d8237788 100644
--- a/jstests/core/collmod_convert_index_uniqueness.js
+++ b/jstests/core/ddl/collmod_convert_index_uniqueness.js
diff --git a/jstests/core/collmod_convert_to_ttl.js b/jstests/core/ddl/collmod_convert_to_ttl.js
index 6fe355d4738..6fe355d4738 100644
--- a/jstests/core/collmod_convert_to_ttl.js
+++ b/jstests/core/ddl/collmod_convert_to_ttl.js
diff --git a/jstests/core/collmod_convert_to_unique_apply_ops.js b/jstests/core/ddl/collmod_convert_to_unique_apply_ops.js
index 65838299994..65838299994 100644
--- a/jstests/core/collmod_convert_to_unique_apply_ops.js
+++ b/jstests/core/ddl/collmod_convert_to_unique_apply_ops.js
diff --git a/jstests/core/collmod_convert_to_unique_violations.js b/jstests/core/ddl/collmod_convert_to_unique_violations.js
index 53b8abeec6e..53b8abeec6e 100644
--- a/jstests/core/collmod_convert_to_unique_violations.js
+++ b/jstests/core/ddl/collmod_convert_to_unique_violations.js
diff --git a/jstests/core/collmod_convert_to_unique_violations_size_limit.js b/jstests/core/ddl/collmod_convert_to_unique_violations_size_limit.js
index 139943b2be8..139943b2be8 100644
--- a/jstests/core/collmod_convert_to_unique_violations_size_limit.js
+++ b/jstests/core/ddl/collmod_convert_to_unique_violations_size_limit.js
diff --git a/jstests/core/collmod_without_uuid.js b/jstests/core/ddl/collmod_without_uuid.js
index be07f9c9f86..be07f9c9f86 100644
--- a/jstests/core/collmod_without_uuid.js
+++ b/jstests/core/ddl/collmod_without_uuid.js
diff --git a/jstests/core/convert_to_capped.js b/jstests/core/ddl/convert_to_capped.js
index 704e0ef0915..704e0ef0915 100644
--- a/jstests/core/convert_to_capped.js
+++ b/jstests/core/ddl/convert_to_capped.js
diff --git a/jstests/core/convert_to_capped_nonexistant.js b/jstests/core/ddl/convert_to_capped_nonexistant.js
index 96844261224..96844261224 100644
--- a/jstests/core/convert_to_capped_nonexistant.js
+++ b/jstests/core/ddl/convert_to_capped_nonexistant.js
diff --git a/jstests/core/create_collection.js b/jstests/core/ddl/create_collection.js
index a9273f0c948..a9273f0c948 100644
--- a/jstests/core/create_collection.js
+++ b/jstests/core/ddl/create_collection.js
diff --git a/jstests/core/create_collection_fail_cleanup.js b/jstests/core/ddl/create_collection_fail_cleanup.js
index 8e39ddf5379..8e39ddf5379 100644
--- a/jstests/core/create_collection_fail_cleanup.js
+++ b/jstests/core/ddl/create_collection_fail_cleanup.js
diff --git a/jstests/core/create_index_helper_validation.js b/jstests/core/ddl/create_index_helper_validation.js
index 1b11a50c6ca..1b11a50c6ca 100644
--- a/jstests/core/create_index_helper_validation.js
+++ b/jstests/core/ddl/create_index_helper_validation.js
diff --git a/jstests/core/create_index_same_spec_different_name.js b/jstests/core/ddl/create_index_same_spec_different_name.js
index 7b08f9f55ca..7b08f9f55ca 100644
--- a/jstests/core/create_index_same_spec_different_name.js
+++ b/jstests/core/ddl/create_index_same_spec_different_name.js
diff --git a/jstests/core/create_indexes.js b/jstests/core/ddl/create_indexes.js
index 64598838466..64598838466 100644
--- a/jstests/core/create_indexes.js
+++ b/jstests/core/ddl/create_indexes.js
diff --git a/jstests/core/create_indexes_with_unknown_field_names.js b/jstests/core/ddl/create_indexes_with_unknown_field_names.js
index 2a3a0cbc9bc..2a3a0cbc9bc 100644
--- a/jstests/core/create_indexes_with_unknown_field_names.js
+++ b/jstests/core/ddl/create_indexes_with_unknown_field_names.js
diff --git a/jstests/core/drop3.js b/jstests/core/ddl/drop3.js
index 78d4872a6c0..78d4872a6c0 100644
--- a/jstests/core/drop3.js
+++ b/jstests/core/ddl/drop3.js
diff --git a/jstests/core/drop_collection.js b/jstests/core/ddl/drop_collection.js
index 3dd4bafbe1b..3dd4bafbe1b 100644
--- a/jstests/core/drop_collection.js
+++ b/jstests/core/ddl/drop_collection.js
diff --git a/jstests/core/drop_index.js b/jstests/core/ddl/drop_index.js
index 3f3e815d47d..3f3e815d47d 100644
--- a/jstests/core/drop_index.js
+++ b/jstests/core/ddl/drop_index.js
diff --git a/jstests/core/drop_indexes.js b/jstests/core/ddl/drop_indexes.js
index 8250d267980..8250d267980 100644
--- a/jstests/core/drop_indexes.js
+++ b/jstests/core/ddl/drop_indexes.js
diff --git a/jstests/core/dropdb.js b/jstests/core/ddl/dropdb.js
index 5d12bae44ca..5d12bae44ca 100644
--- a/jstests/core/dropdb.js
+++ b/jstests/core/ddl/dropdb.js
diff --git a/jstests/core/index_create_too_many.js b/jstests/core/ddl/index_create_too_many.js
index 0b2002d9cc1..0b2002d9cc1 100644
--- a/jstests/core/index_create_too_many.js
+++ b/jstests/core/ddl/index_create_too_many.js
diff --git a/jstests/core/index_create_with_nul_in_name.js b/jstests/core/ddl/index_create_with_nul_in_name.js
index 8c8fe14f0fa..8c8fe14f0fa 100644
--- a/jstests/core/index_create_with_nul_in_name.js
+++ b/jstests/core/ddl/index_create_with_nul_in_name.js
diff --git a/jstests/core/index_dropdups_ignore.js b/jstests/core/ddl/index_dropdups_ignore.js
index 0cc45d65648..0cc45d65648 100644
--- a/jstests/core/index_dropdups_ignore.js
+++ b/jstests/core/ddl/index_dropdups_ignore.js
diff --git a/jstests/core/index_prepareUnique.js b/jstests/core/ddl/index_prepareUnique.js
index 7e47db9840a..7e47db9840a 100644
--- a/jstests/core/index_prepareUnique.js
+++ b/jstests/core/ddl/index_prepareUnique.js
diff --git a/jstests/core/killop_drop_collection.js b/jstests/core/ddl/killop_drop_collection.js
index 17e0154fbfb..17e0154fbfb 100644
--- a/jstests/core/killop_drop_collection.js
+++ b/jstests/core/ddl/killop_drop_collection.js
diff --git a/jstests/core/rename_collection.js b/jstests/core/ddl/rename_collection.js
index ee67447e11c..ee67447e11c 100644
--- a/jstests/core/rename_collection.js
+++ b/jstests/core/ddl/rename_collection.js
diff --git a/jstests/core/rename_collection_capped.js b/jstests/core/ddl/rename_collection_capped.js
index 670e5ce611b..670e5ce611b 100644
--- a/jstests/core/rename_collection_capped.js
+++ b/jstests/core/ddl/rename_collection_capped.js
diff --git a/jstests/core/rename_collection_different_dbs.js b/jstests/core/ddl/rename_collection_different_dbs.js
index b5182582f2b..b5182582f2b 100644
--- a/jstests/core/rename_collection_different_dbs.js
+++ b/jstests/core/ddl/rename_collection_different_dbs.js
diff --git a/jstests/core/rename_collection_long_name.js b/jstests/core/ddl/rename_collection_long_name.js
index becf929a189..becf929a189 100644
--- a/jstests/core/rename_collection_long_name.js
+++ b/jstests/core/ddl/rename_collection_long_name.js
diff --git a/jstests/core/rename_collection_staytemp.js b/jstests/core/ddl/rename_collection_staytemp.js
index 5db125f1a23..5db125f1a23 100644
--- a/jstests/core/rename_collection_staytemp.js
+++ b/jstests/core/ddl/rename_collection_staytemp.js
diff --git a/jstests/core/rename_collection_system_db.js b/jstests/core/ddl/rename_collection_system_db.js
index 8d46ad27a04..8d46ad27a04 100644
--- a/jstests/core/rename_collection_system_db.js
+++ b/jstests/core/ddl/rename_collection_system_db.js
diff --git a/jstests/core/rename_collection_to_itself.js b/jstests/core/ddl/rename_collection_to_itself.js
index 3505d17d1d6..3505d17d1d6 100644
--- a/jstests/core/rename_collection_to_itself.js
+++ b/jstests/core/ddl/rename_collection_to_itself.js
diff --git a/jstests/core/rollback_index_drop.js b/jstests/core/ddl/rollback_index_drop.js
index ac97d090f83..ac97d090f83 100644
--- a/jstests/core/rollback_index_drop.js
+++ b/jstests/core/ddl/rollback_index_drop.js
diff --git a/jstests/core/ttl_index_options.js b/jstests/core/ddl/ttl_index_options.js
index 1a5e2605001..1a5e2605001 100644
--- a/jstests/core/ttl_index_options.js
+++ b/jstests/core/ddl/ttl_index_options.js
diff --git a/jstests/core/bypass_doc_validation.js b/jstests/core/doc_validation/bypass_doc_validation.js
index 4ba40069ee9..4ba40069ee9 100644
--- a/jstests/core/bypass_doc_validation.js
+++ b/jstests/core/doc_validation/bypass_doc_validation.js
diff --git a/jstests/core/doc_validation.js b/jstests/core/doc_validation/doc_validation.js
index f3ebbd03a5f..f3ebbd03a5f 100644
--- a/jstests/core/doc_validation.js
+++ b/jstests/core/doc_validation/doc_validation.js
diff --git a/jstests/core/doc_validation_encrypt_keywords.js b/jstests/core/doc_validation/doc_validation_encrypt_keywords.js
index 2e5b2254127..2e5b2254127 100644
--- a/jstests/core/doc_validation_encrypt_keywords.js
+++ b/jstests/core/doc_validation/doc_validation_encrypt_keywords.js
diff --git a/jstests/core/doc_validation_error.js b/jstests/core/doc_validation/doc_validation_error.js
index 3c2f9b1d918..3c2f9b1d918 100644
--- a/jstests/core/doc_validation_error.js
+++ b/jstests/core/doc_validation/doc_validation_error.js
diff --git a/jstests/core/doc_validation_invalid_validators.js b/jstests/core/doc_validation/doc_validation_invalid_validators.js
index 3bb7d41f926..3bb7d41f926 100644
--- a/jstests/core/doc_validation_invalid_validators.js
+++ b/jstests/core/doc_validation/doc_validation_invalid_validators.js
diff --git a/jstests/core/doc_validation_options.js b/jstests/core/doc_validation/doc_validation_options.js
index 715cb5721b0..715cb5721b0 100644
--- a/jstests/core/doc_validation_options.js
+++ b/jstests/core/doc_validation/doc_validation_options.js
diff --git a/jstests/core/bindata_indexonly.js b/jstests/core/index/bindata_indexonly.js
index 3fc83d0f2fd..3fc83d0f2fd 100644
--- a/jstests/core/bindata_indexonly.js
+++ b/jstests/core/index/bindata_indexonly.js
diff --git a/jstests/core/coveredIndex1.js b/jstests/core/index/covered/coveredIndex1.js
index 0ea6b523a26..0ea6b523a26 100644
--- a/jstests/core/coveredIndex1.js
+++ b/jstests/core/index/covered/coveredIndex1.js
diff --git a/jstests/core/coveredIndex2.js b/jstests/core/index/covered/coveredIndex2.js
index 72724dede1f..72724dede1f 100644
--- a/jstests/core/coveredIndex2.js
+++ b/jstests/core/index/covered/coveredIndex2.js
diff --git a/jstests/core/coveredIndex3.js b/jstests/core/index/covered/coveredIndex3.js
index 8b15b40e862..8b15b40e862 100644
--- a/jstests/core/coveredIndex3.js
+++ b/jstests/core/index/covered/coveredIndex3.js
diff --git a/jstests/core/coveredIndex4.js b/jstests/core/index/covered/coveredIndex4.js
index 7433ed7b9d6..7433ed7b9d6 100644
--- a/jstests/core/coveredIndex4.js
+++ b/jstests/core/index/covered/coveredIndex4.js
diff --git a/jstests/core/covered_index_compound_1.js b/jstests/core/index/covered/covered_index_compound_1.js
index 0efff371059..0efff371059 100644
--- a/jstests/core/covered_index_compound_1.js
+++ b/jstests/core/index/covered/covered_index_compound_1.js
diff --git a/jstests/core/covered_index_negative_1.js b/jstests/core/index/covered/covered_index_negative_1.js
index 2e2179d908a..2e2179d908a 100644
--- a/jstests/core/covered_index_negative_1.js
+++ b/jstests/core/index/covered/covered_index_negative_1.js
diff --git a/jstests/core/covered_index_simple_1.js b/jstests/core/index/covered/covered_index_simple_1.js
index 16a6e3cdc6a..16a6e3cdc6a 100644
--- a/jstests/core/covered_index_simple_1.js
+++ b/jstests/core/index/covered/covered_index_simple_1.js
diff --git a/jstests/core/covered_index_simple_2.js b/jstests/core/index/covered/covered_index_simple_2.js
index cf04f940ad0..cf04f940ad0 100644
--- a/jstests/core/covered_index_simple_2.js
+++ b/jstests/core/index/covered/covered_index_simple_2.js
diff --git a/jstests/core/covered_index_simple_3.js b/jstests/core/index/covered/covered_index_simple_3.js
index 4beff2b3c5a..4beff2b3c5a 100644
--- a/jstests/core/covered_index_simple_3.js
+++ b/jstests/core/index/covered/covered_index_simple_3.js
diff --git a/jstests/core/covered_index_simple_id.js b/jstests/core/index/covered/covered_index_simple_id.js
index 59efcd7f13a..59efcd7f13a 100644
--- a/jstests/core/covered_index_simple_id.js
+++ b/jstests/core/index/covered/covered_index_simple_id.js
diff --git a/jstests/core/covered_index_sort_1.js b/jstests/core/index/covered/covered_index_sort_1.js
index 499bff128e7..499bff128e7 100644
--- a/jstests/core/covered_index_sort_1.js
+++ b/jstests/core/index/covered/covered_index_sort_1.js
diff --git a/jstests/core/covered_index_sort_2.js b/jstests/core/index/covered/covered_index_sort_2.js
index 736a48bb452..736a48bb452 100644
--- a/jstests/core/covered_index_sort_2.js
+++ b/jstests/core/index/covered/covered_index_sort_2.js
diff --git a/jstests/core/covered_index_sort_3.js b/jstests/core/index/covered/covered_index_sort_3.js
index 9e57a79a2a2..9e57a79a2a2 100644
--- a/jstests/core/covered_index_sort_3.js
+++ b/jstests/core/index/covered/covered_index_sort_3.js
diff --git a/jstests/core/covered_index_sort_no_fetch_optimization.js b/jstests/core/index/covered/covered_index_sort_no_fetch_optimization.js
index 416549acb87..416549acb87 100644
--- a/jstests/core/covered_index_sort_no_fetch_optimization.js
+++ b/jstests/core/index/covered/covered_index_sort_no_fetch_optimization.js
diff --git a/jstests/core/elemmatch_index.js b/jstests/core/index/elemmatch_index.js
index a1941620a48..a1941620a48 100644
--- a/jstests/core/elemmatch_index.js
+++ b/jstests/core/index/elemmatch_index.js
diff --git a/jstests/core/fts1.js b/jstests/core/index/fts/fts1.js
index 496420c4c60..496420c4c60 100644
--- a/jstests/core/fts1.js
+++ b/jstests/core/index/fts/fts1.js
diff --git a/jstests/core/fts2.js b/jstests/core/index/fts/fts2.js
index 79be057fed8..79be057fed8 100644
--- a/jstests/core/fts2.js
+++ b/jstests/core/index/fts/fts2.js
diff --git a/jstests/core/fts3.js b/jstests/core/index/fts/fts3.js
index 9b89cda029c..9b89cda029c 100644
--- a/jstests/core/fts3.js
+++ b/jstests/core/index/fts/fts3.js
diff --git a/jstests/core/fts4.js b/jstests/core/index/fts/fts4.js
index bb19fba2221..bb19fba2221 100644
--- a/jstests/core/fts4.js
+++ b/jstests/core/index/fts/fts4.js
diff --git a/jstests/core/fts5.js b/jstests/core/index/fts/fts5.js
index 28d9b48d957..28d9b48d957 100644
--- a/jstests/core/fts5.js
+++ b/jstests/core/index/fts/fts5.js
diff --git a/jstests/core/fts6.js b/jstests/core/index/fts/fts6.js
index 4e201fed2a5..4e201fed2a5 100644
--- a/jstests/core/fts6.js
+++ b/jstests/core/index/fts/fts6.js
diff --git a/jstests/core/fts_array.js b/jstests/core/index/fts/fts_array.js
index 93d4ba1cfb8..93d4ba1cfb8 100644
--- a/jstests/core/fts_array.js
+++ b/jstests/core/index/fts/fts_array.js
diff --git a/jstests/core/fts_blog.js b/jstests/core/index/fts/fts_blog.js
index 5208c166258..5208c166258 100644
--- a/jstests/core/fts_blog.js
+++ b/jstests/core/index/fts/fts_blog.js
diff --git a/jstests/core/fts_blogwild.js b/jstests/core/index/fts/fts_blogwild.js
index f449b6b827e..f449b6b827e 100644
--- a/jstests/core/fts_blogwild.js
+++ b/jstests/core/index/fts/fts_blogwild.js
diff --git a/jstests/core/fts_casesensitive.js b/jstests/core/index/fts/fts_casesensitive.js
index 411ffade50d..411ffade50d 100644
--- a/jstests/core/fts_casesensitive.js
+++ b/jstests/core/index/fts/fts_casesensitive.js
diff --git a/jstests/core/fts_diacritic_and_caseinsensitive.js b/jstests/core/index/fts/fts_diacritic_and_caseinsensitive.js
index 22ad5fb724c..22ad5fb724c 100644
--- a/jstests/core/fts_diacritic_and_caseinsensitive.js
+++ b/jstests/core/index/fts/fts_diacritic_and_caseinsensitive.js
diff --git a/jstests/core/fts_diacritic_and_casesensitive.js b/jstests/core/index/fts/fts_diacritic_and_casesensitive.js
index ba11781b8fd..ba11781b8fd 100644
--- a/jstests/core/fts_diacritic_and_casesensitive.js
+++ b/jstests/core/index/fts/fts_diacritic_and_casesensitive.js
diff --git a/jstests/core/fts_diacriticsensitive.js b/jstests/core/index/fts/fts_diacriticsensitive.js
index 23bc79df168..23bc79df168 100644
--- a/jstests/core/fts_diacriticsensitive.js
+++ b/jstests/core/index/fts/fts_diacriticsensitive.js
diff --git a/jstests/core/fts_dotted_prefix_fields.js b/jstests/core/index/fts/fts_dotted_prefix_fields.js
index 4f634c57312..4f634c57312 100644
--- a/jstests/core/fts_dotted_prefix_fields.js
+++ b/jstests/core/index/fts/fts_dotted_prefix_fields.js
diff --git a/jstests/core/fts_explain.js b/jstests/core/index/fts/fts_explain.js
index 8b0db0794c8..8b0db0794c8 100644
--- a/jstests/core/fts_explain.js
+++ b/jstests/core/index/fts/fts_explain.js
diff --git a/jstests/core/fts_find_and_modify.js b/jstests/core/index/fts/fts_find_and_modify.js
index 9267ad8e6df..9267ad8e6df 100644
--- a/jstests/core/fts_find_and_modify.js
+++ b/jstests/core/index/fts/fts_find_and_modify.js
diff --git a/jstests/core/fts_index.js b/jstests/core/index/fts/fts_index.js
index c78301509f1..c78301509f1 100644
--- a/jstests/core/fts_index.js
+++ b/jstests/core/index/fts/fts_index.js
diff --git a/jstests/core/fts_index2.js b/jstests/core/index/fts/fts_index2.js
index 3ae6e45214e..3ae6e45214e 100644
--- a/jstests/core/fts_index2.js
+++ b/jstests/core/index/fts/fts_index2.js
diff --git a/jstests/core/fts_index3.js b/jstests/core/index/fts/fts_index3.js
index ac4730d0bd0..ac4730d0bd0 100644
--- a/jstests/core/fts_index3.js
+++ b/jstests/core/index/fts/fts_index3.js
diff --git a/jstests/core/fts_index_version1.js b/jstests/core/index/fts/fts_index_version1.js
index 57b7c7710b6..57b7c7710b6 100644
--- a/jstests/core/fts_index_version1.js
+++ b/jstests/core/index/fts/fts_index_version1.js
diff --git a/jstests/core/fts_index_version2.js b/jstests/core/index/fts/fts_index_version2.js
index c55b15aacd0..c55b15aacd0 100644
--- a/jstests/core/fts_index_version2.js
+++ b/jstests/core/index/fts/fts_index_version2.js
diff --git a/jstests/core/fts_index_wildcard_and_weight.js b/jstests/core/index/fts/fts_index_wildcard_and_weight.js
index 0004eb2f48a..0004eb2f48a 100644
--- a/jstests/core/fts_index_wildcard_and_weight.js
+++ b/jstests/core/index/fts/fts_index_wildcard_and_weight.js
diff --git a/jstests/core/fts_mix.js b/jstests/core/index/fts/fts_mix.js
index 5942a85ec2c..5942a85ec2c 100644
--- a/jstests/core/fts_mix.js
+++ b/jstests/core/index/fts/fts_mix.js
diff --git a/jstests/core/fts_partition1.js b/jstests/core/index/fts/fts_partition1.js
index 4a26a3ad629..4a26a3ad629 100644
--- a/jstests/core/fts_partition1.js
+++ b/jstests/core/index/fts/fts_partition1.js
diff --git a/jstests/core/fts_partition_no_multikey.js b/jstests/core/index/fts/fts_partition_no_multikey.js
index b819c3abfbd..b819c3abfbd 100644
--- a/jstests/core/fts_partition_no_multikey.js
+++ b/jstests/core/index/fts/fts_partition_no_multikey.js
diff --git a/jstests/core/fts_phrase.js b/jstests/core/index/fts/fts_phrase.js
index 1a3d7470326..1a3d7470326 100644
--- a/jstests/core/fts_phrase.js
+++ b/jstests/core/index/fts/fts_phrase.js
diff --git a/jstests/core/fts_proj.js b/jstests/core/index/fts/fts_proj.js
index cc89f84442a..cc89f84442a 100644
--- a/jstests/core/fts_proj.js
+++ b/jstests/core/index/fts/fts_proj.js
diff --git a/jstests/core/fts_projection.js b/jstests/core/index/fts/fts_projection.js
index 6e4c99b9230..6e4c99b9230 100644
--- a/jstests/core/fts_projection.js
+++ b/jstests/core/index/fts/fts_projection.js
diff --git a/jstests/core/fts_querylang.js b/jstests/core/index/fts/fts_querylang.js
index f52d3170769..f52d3170769 100644
--- a/jstests/core/fts_querylang.js
+++ b/jstests/core/index/fts/fts_querylang.js
diff --git a/jstests/core/fts_score_sort.js b/jstests/core/index/fts/fts_score_sort.js
index b9103ad0c6b..b9103ad0c6b 100644
--- a/jstests/core/fts_score_sort.js
+++ b/jstests/core/index/fts/fts_score_sort.js
diff --git a/jstests/core/fts_spanish.js b/jstests/core/index/fts/fts_spanish.js
index 988b55cbb80..988b55cbb80 100644
--- a/jstests/core/fts_spanish.js
+++ b/jstests/core/index/fts/fts_spanish.js
diff --git a/jstests/core/fts_trailing_fields.js b/jstests/core/index/fts/fts_trailing_fields.js
index 9db8d905535..9db8d905535 100644
--- a/jstests/core/fts_trailing_fields.js
+++ b/jstests/core/index/fts/fts_trailing_fields.js
diff --git a/jstests/core/geo1.js b/jstests/core/index/geo/geo1.js
index 8a80f59d692..8a80f59d692 100644
--- a/jstests/core/geo1.js
+++ b/jstests/core/index/geo/geo1.js
diff --git a/jstests/core/geo10.js b/jstests/core/index/geo/geo10.js
index 45463711406..45463711406 100644
--- a/jstests/core/geo10.js
+++ b/jstests/core/index/geo/geo10.js
diff --git a/jstests/core/geo2.js b/jstests/core/index/geo/geo2.js
index 34588acac9e..34588acac9e 100644
--- a/jstests/core/geo2.js
+++ b/jstests/core/index/geo/geo2.js
diff --git a/jstests/core/geo3.js b/jstests/core/index/geo/geo3.js
index 7e54fd7dc5f..7e54fd7dc5f 100644
--- a/jstests/core/geo3.js
+++ b/jstests/core/index/geo/geo3.js
diff --git a/jstests/core/geo6.js b/jstests/core/index/geo/geo6.js
index 8d32c066c88..8d32c066c88 100644
--- a/jstests/core/geo6.js
+++ b/jstests/core/index/geo/geo6.js
diff --git a/jstests/core/geo7.js b/jstests/core/index/geo/geo7.js
index 19ce0197fd5..19ce0197fd5 100644
--- a/jstests/core/geo7.js
+++ b/jstests/core/index/geo/geo7.js
diff --git a/jstests/core/geo9.js b/jstests/core/index/geo/geo9.js
index 6b1bfb60631..6b1bfb60631 100644
--- a/jstests/core/geo9.js
+++ b/jstests/core/index/geo/geo9.js
diff --git a/jstests/core/geo_2d_explain.js b/jstests/core/index/geo/geo_2d_explain.js
index 36adad19a6c..36adad19a6c 100644
--- a/jstests/core/geo_2d_explain.js
+++ b/jstests/core/index/geo/geo_2d_explain.js
diff --git a/jstests/core/geo_2d_trailing_fields.js b/jstests/core/index/geo/geo_2d_trailing_fields.js
index aa66832281d..aa66832281d 100644
--- a/jstests/core/geo_2d_trailing_fields.js
+++ b/jstests/core/index/geo/geo_2d_trailing_fields.js
diff --git a/jstests/core/geo_2d_with_geojson_point.js b/jstests/core/index/geo/geo_2d_with_geojson_point.js
index 3930f3c2c96..3930f3c2c96 100644
--- a/jstests/core/geo_2d_with_geojson_point.js
+++ b/jstests/core/index/geo/geo_2d_with_geojson_point.js
diff --git a/jstests/core/geo_allowedcomparisons.js b/jstests/core/index/geo/geo_allowedcomparisons.js
index 2f689f4be68..2f689f4be68 100644
--- a/jstests/core/geo_allowedcomparisons.js
+++ b/jstests/core/index/geo/geo_allowedcomparisons.js
diff --git a/jstests/core/geo_array0.js b/jstests/core/index/geo/geo_array0.js
index 0c9dc096afb..0c9dc096afb 100644
--- a/jstests/core/geo_array0.js
+++ b/jstests/core/index/geo/geo_array0.js
diff --git a/jstests/core/geo_array2.js b/jstests/core/index/geo/geo_array2.js
index 7da56a576eb..7da56a576eb 100644
--- a/jstests/core/geo_array2.js
+++ b/jstests/core/index/geo/geo_array2.js
diff --git a/jstests/core/geo_big_polygon.js b/jstests/core/index/geo/geo_big_polygon.js
index db0d00cf6ff..db0d00cf6ff 100644
--- a/jstests/core/geo_big_polygon.js
+++ b/jstests/core/index/geo/geo_big_polygon.js
diff --git a/jstests/core/geo_big_polygon2.js b/jstests/core/index/geo/geo_big_polygon2.js
index 389bc9ef7bc..389bc9ef7bc 100644
--- a/jstests/core/geo_big_polygon2.js
+++ b/jstests/core/index/geo/geo_big_polygon2.js
diff --git a/jstests/core/geo_big_polygon3.js b/jstests/core/index/geo/geo_big_polygon3.js
index c0b4a7e9012..c0b4a7e9012 100644
--- a/jstests/core/geo_big_polygon3.js
+++ b/jstests/core/index/geo/geo_big_polygon3.js
diff --git a/jstests/core/geo_borders.js b/jstests/core/index/geo/geo_borders.js
index 897697a88cb..897697a88cb 100644
--- a/jstests/core/geo_borders.js
+++ b/jstests/core/index/geo/geo_borders.js
diff --git a/jstests/core/geo_box1.js b/jstests/core/index/geo/geo_box1.js
index d0c4ff50bdf..d0c4ff50bdf 100644
--- a/jstests/core/geo_box1.js
+++ b/jstests/core/index/geo/geo_box1.js
diff --git a/jstests/core/geo_box1_noindex.js b/jstests/core/index/geo/geo_box1_noindex.js
index 879f17e3002..879f17e3002 100644
--- a/jstests/core/geo_box1_noindex.js
+++ b/jstests/core/index/geo/geo_box1_noindex.js
diff --git a/jstests/core/geo_box2.js b/jstests/core/index/geo/geo_box2.js
index 7120cfd3e4a..7120cfd3e4a 100644
--- a/jstests/core/geo_box2.js
+++ b/jstests/core/index/geo/geo_box2.js
diff --git a/jstests/core/geo_box3.js b/jstests/core/index/geo/geo_box3.js
index 4a91ffb0d1d..4a91ffb0d1d 100644
--- a/jstests/core/geo_box3.js
+++ b/jstests/core/index/geo/geo_box3.js
diff --git a/jstests/core/geo_center_sphere1.js b/jstests/core/index/geo/geo_center_sphere1.js
index 2b37c7c3f96..2b37c7c3f96 100644
--- a/jstests/core/geo_center_sphere1.js
+++ b/jstests/core/index/geo/geo_center_sphere1.js
diff --git a/jstests/core/geo_center_sphere2.js b/jstests/core/index/geo/geo_center_sphere2.js
index 1c59850d841..1c59850d841 100644
--- a/jstests/core/geo_center_sphere2.js
+++ b/jstests/core/index/geo/geo_center_sphere2.js
diff --git a/jstests/core/geo_circle1.js b/jstests/core/index/geo/geo_circle1.js
index a4bce59c8bd..a4bce59c8bd 100644
--- a/jstests/core/geo_circle1.js
+++ b/jstests/core/index/geo/geo_circle1.js
diff --git a/jstests/core/geo_circle1_noindex.js b/jstests/core/index/geo/geo_circle1_noindex.js
index 4e1b8ed9e5f..4e1b8ed9e5f 100644
--- a/jstests/core/geo_circle1_noindex.js
+++ b/jstests/core/index/geo/geo_circle1_noindex.js
diff --git a/jstests/core/geo_circle2.js b/jstests/core/index/geo/geo_circle2.js
index d7947f96502..d7947f96502 100644
--- a/jstests/core/geo_circle2.js
+++ b/jstests/core/index/geo/geo_circle2.js
diff --git a/jstests/core/geo_circle2a.js b/jstests/core/index/geo/geo_circle2a.js
index f647bdc82ea..f647bdc82ea 100644
--- a/jstests/core/geo_circle2a.js
+++ b/jstests/core/index/geo/geo_circle2a.js
diff --git a/jstests/core/geo_circle3.js b/jstests/core/index/geo/geo_circle3.js
index da7a9af6b34..da7a9af6b34 100644
--- a/jstests/core/geo_circle3.js
+++ b/jstests/core/index/geo/geo_circle3.js
diff --git a/jstests/core/geo_circle4.js b/jstests/core/index/geo/geo_circle4.js
index c2194142795..c2194142795 100644
--- a/jstests/core/geo_circle4.js
+++ b/jstests/core/index/geo/geo_circle4.js
diff --git a/jstests/core/geo_circle5.js b/jstests/core/index/geo/geo_circle5.js
index 27b973a8ede..27b973a8ede 100644
--- a/jstests/core/geo_circle5.js
+++ b/jstests/core/index/geo/geo_circle5.js
diff --git a/jstests/core/geo_distinct.js b/jstests/core/index/geo/geo_distinct.js
index f4c9eca312f..f4c9eca312f 100644
--- a/jstests/core/geo_distinct.js
+++ b/jstests/core/index/geo/geo_distinct.js
diff --git a/jstests/core/geo_exactfetch.js b/jstests/core/index/geo/geo_exactfetch.js
index 43ef46fb558..43ef46fb558 100644
--- a/jstests/core/geo_exactfetch.js
+++ b/jstests/core/index/geo/geo_exactfetch.js
diff --git a/jstests/core/geo_fiddly_box.js b/jstests/core/index/geo/geo_fiddly_box.js
index 9f5a9e8d6c4..9f5a9e8d6c4 100644
--- a/jstests/core/geo_fiddly_box.js
+++ b/jstests/core/index/geo/geo_fiddly_box.js
diff --git a/jstests/core/geo_fiddly_box2.js b/jstests/core/index/geo/geo_fiddly_box2.js
index a0f87203163..a0f87203163 100644
--- a/jstests/core/geo_fiddly_box2.js
+++ b/jstests/core/index/geo/geo_fiddly_box2.js
diff --git a/jstests/core/geo_invalid_2d_params.js b/jstests/core/index/geo/geo_invalid_2d_params.js
index 33419302b47..33419302b47 100644
--- a/jstests/core/geo_invalid_2d_params.js
+++ b/jstests/core/index/geo/geo_invalid_2d_params.js
diff --git a/jstests/core/geo_invalid_polygon.js b/jstests/core/index/geo/geo_invalid_polygon.js
index 0eab7ca5406..0eab7ca5406 100644
--- a/jstests/core/geo_invalid_polygon.js
+++ b/jstests/core/index/geo/geo_invalid_polygon.js
diff --git a/jstests/core/geo_max.js b/jstests/core/index/geo/geo_max.js
index 3ef6e39dcaa..3ef6e39dcaa 100644
--- a/jstests/core/geo_max.js
+++ b/jstests/core/index/geo/geo_max.js
diff --git a/jstests/core/geo_mindistance.js b/jstests/core/index/geo/geo_mindistance.js
index 35ce8065ae4..35ce8065ae4 100644
--- a/jstests/core/geo_mindistance.js
+++ b/jstests/core/index/geo/geo_mindistance.js
diff --git a/jstests/core/geo_mindistance_boundaries.js b/jstests/core/index/geo/geo_mindistance_boundaries.js
index 0d46d60780d..0d46d60780d 100644
--- a/jstests/core/geo_mindistance_boundaries.js
+++ b/jstests/core/index/geo/geo_mindistance_boundaries.js
diff --git a/jstests/core/geo_multikey0.js b/jstests/core/index/geo/geo_multikey0.js
index 27075a779ee..27075a779ee 100644
--- a/jstests/core/geo_multikey0.js
+++ b/jstests/core/index/geo/geo_multikey0.js
diff --git a/jstests/core/geo_multikey1.js b/jstests/core/index/geo/geo_multikey1.js
index e6d0ec086da..e6d0ec086da 100644
--- a/jstests/core/geo_multikey1.js
+++ b/jstests/core/index/geo/geo_multikey1.js
diff --git a/jstests/core/geo_multinest0.js b/jstests/core/index/geo/geo_multinest0.js
index 746a530e19b..746a530e19b 100644
--- a/jstests/core/geo_multinest0.js
+++ b/jstests/core/index/geo/geo_multinest0.js
diff --git a/jstests/core/geo_multinest1.js b/jstests/core/index/geo/geo_multinest1.js
index b6aa53cae16..b6aa53cae16 100644
--- a/jstests/core/geo_multinest1.js
+++ b/jstests/core/index/geo/geo_multinest1.js
diff --git a/jstests/core/geo_near_bounds_overflow.js b/jstests/core/index/geo/geo_near_bounds_overflow.js
index 1d13d568220..1d13d568220 100644
--- a/jstests/core/geo_near_bounds_overflow.js
+++ b/jstests/core/index/geo/geo_near_bounds_overflow.js
diff --git a/jstests/core/geo_near_point_query.js b/jstests/core/index/geo/geo_near_point_query.js
index 74b2de46ce4..74b2de46ce4 100644
--- a/jstests/core/geo_near_point_query.js
+++ b/jstests/core/index/geo/geo_near_point_query.js
diff --git a/jstests/core/geo_near_random1.js b/jstests/core/index/geo/geo_near_random1.js
index 1573e72c1f8..1573e72c1f8 100644
--- a/jstests/core/geo_near_random1.js
+++ b/jstests/core/index/geo/geo_near_random1.js
diff --git a/jstests/core/geo_near_random2.js b/jstests/core/index/geo/geo_near_random2.js
index a9e242edbcc..a9e242edbcc 100644
--- a/jstests/core/geo_near_random2.js
+++ b/jstests/core/index/geo/geo_near_random2.js
diff --git a/jstests/core/geo_near_tailable.js b/jstests/core/index/geo/geo_near_tailable.js
index 5629a384f01..5629a384f01 100644
--- a/jstests/core/geo_near_tailable.js
+++ b/jstests/core/index/geo/geo_near_tailable.js
diff --git a/jstests/core/geo_nearwithin.js b/jstests/core/index/geo/geo_nearwithin.js
index 34fc1edae5e..34fc1edae5e 100644
--- a/jstests/core/geo_nearwithin.js
+++ b/jstests/core/index/geo/geo_nearwithin.js
diff --git a/jstests/core/geo_oob_sphere.js b/jstests/core/index/geo/geo_oob_sphere.js
index ba04ea72e04..ba04ea72e04 100644
--- a/jstests/core/geo_oob_sphere.js
+++ b/jstests/core/index/geo/geo_oob_sphere.js
diff --git a/jstests/core/geo_operator_crs.js b/jstests/core/index/geo/geo_operator_crs.js
index 2f22e501a41..2f22e501a41 100644
--- a/jstests/core/geo_operator_crs.js
+++ b/jstests/core/index/geo/geo_operator_crs.js
diff --git a/jstests/core/geo_or.js b/jstests/core/index/geo/geo_or.js
index cee91d4929d..cee91d4929d 100644
--- a/jstests/core/geo_or.js
+++ b/jstests/core/index/geo/geo_or.js
diff --git a/jstests/core/geo_poly_edge.js b/jstests/core/index/geo/geo_poly_edge.js
index 8608af36615..8608af36615 100644
--- a/jstests/core/geo_poly_edge.js
+++ b/jstests/core/index/geo/geo_poly_edge.js
diff --git a/jstests/core/geo_poly_line.js b/jstests/core/index/geo/geo_poly_line.js
index 85dc9274158..85dc9274158 100644
--- a/jstests/core/geo_poly_line.js
+++ b/jstests/core/index/geo/geo_poly_line.js
diff --git a/jstests/core/geo_polygon1.js b/jstests/core/index/geo/geo_polygon1.js
index 82d499704db..82d499704db 100644
--- a/jstests/core/geo_polygon1.js
+++ b/jstests/core/index/geo/geo_polygon1.js
diff --git a/jstests/core/geo_polygon1_noindex.js b/jstests/core/index/geo/geo_polygon1_noindex.js
index 5f43f736b45..5f43f736b45 100644
--- a/jstests/core/geo_polygon1_noindex.js
+++ b/jstests/core/index/geo/geo_polygon1_noindex.js
diff --git a/jstests/core/geo_polygon2.js b/jstests/core/index/geo/geo_polygon2.js
index 7a6ad0aedb5..7a6ad0aedb5 100644
--- a/jstests/core/geo_polygon2.js
+++ b/jstests/core/index/geo/geo_polygon2.js
diff --git a/jstests/core/geo_polygon3.js b/jstests/core/index/geo/geo_polygon3.js
index c8167bc685b..c8167bc685b 100644
--- a/jstests/core/geo_polygon3.js
+++ b/jstests/core/index/geo/geo_polygon3.js
diff --git a/jstests/core/geo_queryoptimizer.js b/jstests/core/index/geo/geo_queryoptimizer.js
index 199cedf5330..199cedf5330 100644
--- a/jstests/core/geo_queryoptimizer.js
+++ b/jstests/core/index/geo/geo_queryoptimizer.js
diff --git a/jstests/core/geo_regex0.js b/jstests/core/index/geo/geo_regex0.js
index 7629c193ea2..7629c193ea2 100644
--- a/jstests/core/geo_regex0.js
+++ b/jstests/core/index/geo/geo_regex0.js
diff --git a/jstests/core/geo_s2cursorlimitskip.js b/jstests/core/index/geo/geo_s2cursorlimitskip.js
index 7a2aa2f5782..7a2aa2f5782 100644
--- a/jstests/core/geo_s2cursorlimitskip.js
+++ b/jstests/core/index/geo/geo_s2cursorlimitskip.js
diff --git a/jstests/core/geo_s2dedupnear.js b/jstests/core/index/geo/geo_s2dedupnear.js
index ad1674f1e6e..ad1674f1e6e 100644
--- a/jstests/core/geo_s2dedupnear.js
+++ b/jstests/core/index/geo/geo_s2dedupnear.js
diff --git a/jstests/core/geo_s2descindex.js b/jstests/core/index/geo/geo_s2descindex.js
index d5360aa7fb7..d5360aa7fb7 100644
--- a/jstests/core/geo_s2descindex.js
+++ b/jstests/core/index/geo/geo_s2descindex.js
diff --git a/jstests/core/geo_s2disjoint_holes.js b/jstests/core/index/geo/geo_s2disjoint_holes.js
index 5cbf6a2422e..5cbf6a2422e 100644
--- a/jstests/core/geo_s2disjoint_holes.js
+++ b/jstests/core/index/geo/geo_s2disjoint_holes.js
diff --git a/jstests/core/geo_s2dupe_points.js b/jstests/core/index/geo/geo_s2dupe_points.js
index 9f94f69caaa..9f94f69caaa 100644
--- a/jstests/core/geo_s2dupe_points.js
+++ b/jstests/core/index/geo/geo_s2dupe_points.js
diff --git a/jstests/core/geo_s2edgecases.js b/jstests/core/index/geo/geo_s2edgecases.js
index 6e4633f58c8..6e4633f58c8 100644
--- a/jstests/core/geo_s2edgecases.js
+++ b/jstests/core/index/geo/geo_s2edgecases.js
diff --git a/jstests/core/geo_s2exact.js b/jstests/core/index/geo/geo_s2exact.js
index 92ce551d873..92ce551d873 100644
--- a/jstests/core/geo_s2exact.js
+++ b/jstests/core/index/geo/geo_s2exact.js
diff --git a/jstests/core/geo_s2explain.js b/jstests/core/index/geo/geo_s2explain.js
index ca51dd32920..ca51dd32920 100644
--- a/jstests/core/geo_s2explain.js
+++ b/jstests/core/index/geo/geo_s2explain.js
diff --git a/jstests/core/geo_s2holesameasshell.js b/jstests/core/index/geo/geo_s2holesameasshell.js
index 0b3f8ea35ec..0b3f8ea35ec 100644
--- a/jstests/core/geo_s2holesameasshell.js
+++ b/jstests/core/index/geo/geo_s2holesameasshell.js
diff --git a/jstests/core/geo_s2index.js b/jstests/core/index/geo/geo_s2index.js
index af4475a79cb..af4475a79cb 100644
--- a/jstests/core/geo_s2index.js
+++ b/jstests/core/index/geo/geo_s2index.js
diff --git a/jstests/core/geo_s2indexoldformat.js b/jstests/core/index/geo/geo_s2indexoldformat.js
index ffe472464d4..ffe472464d4 100644
--- a/jstests/core/geo_s2indexoldformat.js
+++ b/jstests/core/index/geo/geo_s2indexoldformat.js
diff --git a/jstests/core/geo_s2indexversion1.js b/jstests/core/index/geo/geo_s2indexversion1.js
index 2df90bb1235..2df90bb1235 100644
--- a/jstests/core/geo_s2indexversion1.js
+++ b/jstests/core/index/geo/geo_s2indexversion1.js
diff --git a/jstests/core/geo_s2intersection.js b/jstests/core/index/geo/geo_s2intersection.js
index 958da005a9f..958da005a9f 100644
--- a/jstests/core/geo_s2intersection.js
+++ b/jstests/core/index/geo/geo_s2intersection.js
diff --git a/jstests/core/geo_s2largewithin.js b/jstests/core/index/geo/geo_s2largewithin.js
index e1eed8a2e6a..e1eed8a2e6a 100644
--- a/jstests/core/geo_s2largewithin.js
+++ b/jstests/core/index/geo/geo_s2largewithin.js
diff --git a/jstests/core/geo_s2meridian.js b/jstests/core/index/geo/geo_s2meridian.js
index 99eb0c63dc4..99eb0c63dc4 100644
--- a/jstests/core/geo_s2meridian.js
+++ b/jstests/core/index/geo/geo_s2meridian.js
diff --git a/jstests/core/geo_s2multi.js b/jstests/core/index/geo/geo_s2multi.js
index 858dfd1efa1..858dfd1efa1 100644
--- a/jstests/core/geo_s2multi.js
+++ b/jstests/core/index/geo/geo_s2multi.js
diff --git a/jstests/core/geo_s2near.js b/jstests/core/index/geo/geo_s2near.js
index 2cd732da67a..2cd732da67a 100644
--- a/jstests/core/geo_s2near.js
+++ b/jstests/core/index/geo/geo_s2near.js
diff --git a/jstests/core/geo_s2nearComplex.js b/jstests/core/index/geo/geo_s2nearComplex.js
index 22fe3112499..22fe3112499 100644
--- a/jstests/core/geo_s2nearComplex.js
+++ b/jstests/core/index/geo/geo_s2nearComplex.js
diff --git a/jstests/core/geo_s2near_equator_opposite.js b/jstests/core/index/geo/geo_s2near_equator_opposite.js
index 223eb50a0b5..223eb50a0b5 100644
--- a/jstests/core/geo_s2near_equator_opposite.js
+++ b/jstests/core/index/geo/geo_s2near_equator_opposite.js
diff --git a/jstests/core/geo_s2nearcorrect.js b/jstests/core/index/geo/geo_s2nearcorrect.js
index 80ece4223d2..80ece4223d2 100644
--- a/jstests/core/geo_s2nearcorrect.js
+++ b/jstests/core/index/geo/geo_s2nearcorrect.js
diff --git a/jstests/core/geo_s2nearwithin.js b/jstests/core/index/geo/geo_s2nearwithin.js
index 5d69399dc35..5d69399dc35 100644
--- a/jstests/core/geo_s2nearwithin.js
+++ b/jstests/core/index/geo/geo_s2nearwithin.js
diff --git a/jstests/core/geo_s2nongeoarray.js b/jstests/core/index/geo/geo_s2nongeoarray.js
index f5830e8702d..f5830e8702d 100644
--- a/jstests/core/geo_s2nongeoarray.js
+++ b/jstests/core/index/geo/geo_s2nongeoarray.js
diff --git a/jstests/core/geo_s2nonstring.js b/jstests/core/index/geo/geo_s2nonstring.js
index a76a7cd073e..a76a7cd073e 100644
--- a/jstests/core/geo_s2nonstring.js
+++ b/jstests/core/index/geo/geo_s2nonstring.js
diff --git a/jstests/core/geo_s2nopoints.js b/jstests/core/index/geo/geo_s2nopoints.js
index 7b3a3b970a7..7b3a3b970a7 100644
--- a/jstests/core/geo_s2nopoints.js
+++ b/jstests/core/index/geo/geo_s2nopoints.js
diff --git a/jstests/core/geo_s2oddshapes.js b/jstests/core/index/geo/geo_s2oddshapes.js
index db30d431caa..db30d431caa 100644
--- a/jstests/core/geo_s2oddshapes.js
+++ b/jstests/core/index/geo/geo_s2oddshapes.js
diff --git a/jstests/core/geo_s2ordering.js b/jstests/core/index/geo/geo_s2ordering.js
index 9afb1a8fa7c..9afb1a8fa7c 100644
--- a/jstests/core/geo_s2ordering.js
+++ b/jstests/core/index/geo/geo_s2ordering.js
diff --git a/jstests/core/geo_s2overlappingpolys.js b/jstests/core/index/geo/geo_s2overlappingpolys.js
index 980b985f425..980b985f425 100644
--- a/jstests/core/geo_s2overlappingpolys.js
+++ b/jstests/core/index/geo/geo_s2overlappingpolys.js
diff --git a/jstests/core/geo_s2polywithholes.js b/jstests/core/index/geo/geo_s2polywithholes.js
index 1d337e9bf1d..1d337e9bf1d 100644
--- a/jstests/core/geo_s2polywithholes.js
+++ b/jstests/core/index/geo/geo_s2polywithholes.js
diff --git a/jstests/core/geo_s2selfintersectingpoly.js b/jstests/core/index/geo/geo_s2selfintersectingpoly.js
index 0ac522fa6f7..0ac522fa6f7 100644
--- a/jstests/core/geo_s2selfintersectingpoly.js
+++ b/jstests/core/index/geo/geo_s2selfintersectingpoly.js
diff --git a/jstests/core/geo_s2sparse.js b/jstests/core/index/geo/geo_s2sparse.js
index 1154a1d0d84..1154a1d0d84 100644
--- a/jstests/core/geo_s2sparse.js
+++ b/jstests/core/index/geo/geo_s2sparse.js
diff --git a/jstests/core/geo_s2twofields.js b/jstests/core/index/geo/geo_s2twofields.js
index 9f769f6897f..9f769f6897f 100644
--- a/jstests/core/geo_s2twofields.js
+++ b/jstests/core/index/geo/geo_s2twofields.js
diff --git a/jstests/core/geo_s2validindex.js b/jstests/core/index/geo/geo_s2validindex.js
index 444346def14..444346def14 100644
--- a/jstests/core/geo_s2validindex.js
+++ b/jstests/core/index/geo/geo_s2validindex.js
diff --git a/jstests/core/geo_s2within.js b/jstests/core/index/geo/geo_s2within.js
index 04915c77dcb..04915c77dcb 100644
--- a/jstests/core/geo_s2within.js
+++ b/jstests/core/index/geo/geo_s2within.js
diff --git a/jstests/core/geo_s2within_line_polygon_sphere.js b/jstests/core/index/geo/geo_s2within_line_polygon_sphere.js
index 8cafa602ec4..8cafa602ec4 100644
--- a/jstests/core/geo_s2within_line_polygon_sphere.js
+++ b/jstests/core/index/geo/geo_s2within_line_polygon_sphere.js
diff --git a/jstests/core/geo_small_large.js b/jstests/core/index/geo/geo_small_large.js
index 9d165c418ae..9d165c418ae 100644
--- a/jstests/core/geo_small_large.js
+++ b/jstests/core/index/geo/geo_small_large.js
diff --git a/jstests/core/geo_sort1.js b/jstests/core/index/geo/geo_sort1.js
index 4d32c2f4ae2..4d32c2f4ae2 100644
--- a/jstests/core/geo_sort1.js
+++ b/jstests/core/index/geo/geo_sort1.js
diff --git a/jstests/core/geo_uniqueDocs.js b/jstests/core/index/geo/geo_uniqueDocs.js
index 9e0a811e7e7..9e0a811e7e7 100644
--- a/jstests/core/geo_uniqueDocs.js
+++ b/jstests/core/index/geo/geo_uniqueDocs.js
diff --git a/jstests/core/geo_uniqueDocs2.js b/jstests/core/index/geo/geo_uniqueDocs2.js
index 85549a3cd94..85549a3cd94 100644
--- a/jstests/core/geo_uniqueDocs2.js
+++ b/jstests/core/index/geo/geo_uniqueDocs2.js
diff --git a/jstests/core/geo_update.js b/jstests/core/index/geo/geo_update.js
index 015e56e34a5..015e56e34a5 100644
--- a/jstests/core/geo_update.js
+++ b/jstests/core/index/geo/geo_update.js
diff --git a/jstests/core/geo_update1.js b/jstests/core/index/geo/geo_update1.js
index f982966afd7..f982966afd7 100644
--- a/jstests/core/geo_update1.js
+++ b/jstests/core/index/geo/geo_update1.js
diff --git a/jstests/core/geo_update2.js b/jstests/core/index/geo/geo_update2.js
index 280023ffe44..280023ffe44 100644
--- a/jstests/core/geo_update2.js
+++ b/jstests/core/index/geo/geo_update2.js
diff --git a/jstests/core/geo_update_btree.js b/jstests/core/index/geo/geo_update_btree.js
index 7a58362fe18..7a58362fe18 100644
--- a/jstests/core/geo_update_btree.js
+++ b/jstests/core/index/geo/geo_update_btree.js
diff --git a/jstests/core/geo_update_btree2.js b/jstests/core/index/geo/geo_update_btree2.js
index 9f1f59fc162..9f1f59fc162 100644
--- a/jstests/core/geo_update_btree2.js
+++ b/jstests/core/index/geo/geo_update_btree2.js
diff --git a/jstests/core/geo_update_dedup.js b/jstests/core/index/geo/geo_update_dedup.js
index 10c2ca0dfc7..10c2ca0dfc7 100644
--- a/jstests/core/geo_update_dedup.js
+++ b/jstests/core/index/geo/geo_update_dedup.js
diff --git a/jstests/core/geo_validate.js b/jstests/core/index/geo/geo_validate.js
index 3a945b6eae8..3a945b6eae8 100644
--- a/jstests/core/geo_validate.js
+++ b/jstests/core/index/geo/geo_validate.js
diff --git a/jstests/core/geo_withinquery.js b/jstests/core/index/geo/geo_withinquery.js
index 13f20c1433f..13f20c1433f 100644
--- a/jstests/core/geo_withinquery.js
+++ b/jstests/core/index/geo/geo_withinquery.js
diff --git a/jstests/core/geoa.js b/jstests/core/index/geo/geoa.js
index 78cf6c960c9..78cf6c960c9 100644
--- a/jstests/core/geoa.js
+++ b/jstests/core/index/geo/geoa.js
diff --git a/jstests/core/geob.js b/jstests/core/index/geo/geob.js
index 2d5c8e368ff..2d5c8e368ff 100644
--- a/jstests/core/geob.js
+++ b/jstests/core/index/geo/geob.js
diff --git a/jstests/core/geoc.js b/jstests/core/index/geo/geoc.js
index 8875cd44614..8875cd44614 100644
--- a/jstests/core/geoc.js
+++ b/jstests/core/index/geo/geoc.js
diff --git a/jstests/core/geod.js b/jstests/core/index/geo/geod.js
index 8586d64e398..8586d64e398 100644
--- a/jstests/core/geod.js
+++ b/jstests/core/index/geo/geod.js
diff --git a/jstests/core/geoe.js b/jstests/core/index/geo/geoe.js
index 84bc34f7a74..84bc34f7a74 100644
--- a/jstests/core/geoe.js
+++ b/jstests/core/index/geo/geoe.js
diff --git a/jstests/core/geof.js b/jstests/core/index/geo/geof.js
index 1f1d9e0cc67..1f1d9e0cc67 100644
--- a/jstests/core/geof.js
+++ b/jstests/core/index/geo/geof.js
diff --git a/jstests/core/geonear_cmd_input_validation.js b/jstests/core/index/geo/geonear_cmd_input_validation.js
index 5b247759db1..5b247759db1 100644
--- a/jstests/core/geonear_cmd_input_validation.js
+++ b/jstests/core/index/geo/geonear_cmd_input_validation.js
diff --git a/jstests/core/geonear_key.js b/jstests/core/index/geo/geonear_key.js
index 1ecce018b08..1ecce018b08 100644
--- a/jstests/core/geonear_key.js
+++ b/jstests/core/index/geo/geonear_key.js
diff --git a/jstests/core/hashed_index_collation.js b/jstests/core/index/hashed/hashed_index_collation.js
index ead8b69bbfc..ead8b69bbfc 100644
--- a/jstests/core/hashed_index_collation.js
+++ b/jstests/core/index/hashed/hashed_index_collation.js
diff --git a/jstests/core/hashed_index_covered_queries.js b/jstests/core/index/hashed/hashed_index_covered_queries.js
index fa7753a89a5..fa7753a89a5 100644
--- a/jstests/core/hashed_index_covered_queries.js
+++ b/jstests/core/index/hashed/hashed_index_covered_queries.js
diff --git a/jstests/core/hashed_index_queries.js b/jstests/core/index/hashed/hashed_index_queries.js
index 54044855cc0..54044855cc0 100644
--- a/jstests/core/hashed_index_queries.js
+++ b/jstests/core/index/hashed/hashed_index_queries.js
diff --git a/jstests/core/hashed_index_queries_with_logical_operators.js b/jstests/core/index/hashed/hashed_index_queries_with_logical_operators.js
index 79d5c33759f..79d5c33759f 100644
--- a/jstests/core/hashed_index_queries_with_logical_operators.js
+++ b/jstests/core/index/hashed/hashed_index_queries_with_logical_operators.js
diff --git a/jstests/core/hashed_index_sort.js b/jstests/core/index/hashed/hashed_index_sort.js
index 189e40a1569..189e40a1569 100644
--- a/jstests/core/hashed_index_sort.js
+++ b/jstests/core/index/hashed/hashed_index_sort.js
diff --git a/jstests/core/hashed_index_with_arrays.js b/jstests/core/index/hashed/hashed_index_with_arrays.js
index 8d6cc157eb6..8d6cc157eb6 100644
--- a/jstests/core/hashed_index_with_arrays.js
+++ b/jstests/core/index/hashed/hashed_index_with_arrays.js
diff --git a/jstests/core/hidden_index.js b/jstests/core/index/hidden_index.js
index aa27bbd5464..aa27bbd5464 100644
--- a/jstests/core/hidden_index.js
+++ b/jstests/core/index/hidden_index.js
diff --git a/jstests/core/index1.js b/jstests/core/index/index1.js
index 4c06bfe03fd..4c06bfe03fd 100644
--- a/jstests/core/index1.js
+++ b/jstests/core/index/index1.js
diff --git a/jstests/core/index13.js b/jstests/core/index/index13.js
index 97a3a85f773..97a3a85f773 100644
--- a/jstests/core/index13.js
+++ b/jstests/core/index/index13.js
diff --git a/jstests/core/index2.js b/jstests/core/index/index2.js
index 5cfbb2f1590..5cfbb2f1590 100644
--- a/jstests/core/index2.js
+++ b/jstests/core/index/index2.js
diff --git a/jstests/core/index4.js b/jstests/core/index/index4.js
index 179bcdd9726..179bcdd9726 100644
--- a/jstests/core/index4.js
+++ b/jstests/core/index/index4.js
diff --git a/jstests/core/index5.js b/jstests/core/index/index5.js
index 908b433c299..908b433c299 100644
--- a/jstests/core/index5.js
+++ b/jstests/core/index/index5.js
diff --git a/jstests/core/index6.js b/jstests/core/index/index6.js
index 4626e9359ea..4626e9359ea 100644
--- a/jstests/core/index6.js
+++ b/jstests/core/index/index6.js
diff --git a/jstests/core/index8.js b/jstests/core/index/index8.js
index 3887906dddc..3887906dddc 100644
--- a/jstests/core/index8.js
+++ b/jstests/core/index/index8.js
diff --git a/jstests/core/index9.js b/jstests/core/index/index9.js
index 7bf7ec5ac43..7bf7ec5ac43 100644
--- a/jstests/core/index9.js
+++ b/jstests/core/index/index9.js
diff --git a/jstests/core/index_arr1.js b/jstests/core/index/index_arr1.js
index d6db3e621cd..d6db3e621cd 100644
--- a/jstests/core/index_arr1.js
+++ b/jstests/core/index/index_arr1.js
diff --git a/jstests/core/index_arr2.js b/jstests/core/index/index_arr2.js
index 99950880422..99950880422 100644
--- a/jstests/core/index_arr2.js
+++ b/jstests/core/index/index_arr2.js
diff --git a/jstests/core/index_bigkeys.js b/jstests/core/index/index_bigkeys.js
index fa53a70a87d..fa53a70a87d 100644
--- a/jstests/core/index_bigkeys.js
+++ b/jstests/core/index/index_bigkeys.js
diff --git a/jstests/core/index_bounds_code.js b/jstests/core/index/index_bounds_code.js
index 0bc80201eb4..0bc80201eb4 100644
--- a/jstests/core/index_bounds_code.js
+++ b/jstests/core/index/index_bounds_code.js
diff --git a/jstests/core/index_bounds_maxkey.js b/jstests/core/index/index_bounds_maxkey.js
index 1b59340fffe..1b59340fffe 100644
--- a/jstests/core/index_bounds_maxkey.js
+++ b/jstests/core/index/index_bounds_maxkey.js
diff --git a/jstests/core/index_bounds_minkey.js b/jstests/core/index/index_bounds_minkey.js
index 78efd322b12..78efd322b12 100644
--- a/jstests/core/index_bounds_minkey.js
+++ b/jstests/core/index/index_bounds_minkey.js
diff --git a/jstests/core/index_bounds_number_edge_cases.js b/jstests/core/index/index_bounds_number_edge_cases.js
index 3da4e53e2d0..3da4e53e2d0 100644
--- a/jstests/core/index_bounds_number_edge_cases.js
+++ b/jstests/core/index/index_bounds_number_edge_cases.js
diff --git a/jstests/core/index_bounds_object.js b/jstests/core/index/index_bounds_object.js
index 255fb55f117..255fb55f117 100644
--- a/jstests/core/index_bounds_object.js
+++ b/jstests/core/index/index_bounds_object.js
diff --git a/jstests/core/index_bounds_pipe.js b/jstests/core/index/index_bounds_pipe.js
index f94c5a748fa..f94c5a748fa 100644
--- a/jstests/core/index_bounds_pipe.js
+++ b/jstests/core/index/index_bounds_pipe.js
diff --git a/jstests/core/index_bounds_timestamp.js b/jstests/core/index/index_bounds_timestamp.js
index 1edf62b929e..1edf62b929e 100644
--- a/jstests/core/index_bounds_timestamp.js
+++ b/jstests/core/index/index_bounds_timestamp.js
diff --git a/jstests/core/index_check2.js b/jstests/core/index/index_check2.js
index e296e3b558a..e296e3b558a 100644
--- a/jstests/core/index_check2.js
+++ b/jstests/core/index/index_check2.js
diff --git a/jstests/core/index_check3.js b/jstests/core/index/index_check3.js
index 4cc7aae4cb7..4cc7aae4cb7 100644
--- a/jstests/core/index_check3.js
+++ b/jstests/core/index/index_check3.js
diff --git a/jstests/core/index_check5.js b/jstests/core/index/index_check5.js
index 8921e014fcd..8921e014fcd 100644
--- a/jstests/core/index_check5.js
+++ b/jstests/core/index/index_check5.js
diff --git a/jstests/core/index_check6.js b/jstests/core/index/index_check6.js
index 00d91738ae5..00d91738ae5 100644
--- a/jstests/core/index_check6.js
+++ b/jstests/core/index/index_check6.js
diff --git a/jstests/core/index_check7.js b/jstests/core/index/index_check7.js
index 3bcc7b2302d..3bcc7b2302d 100644
--- a/jstests/core/index_check7.js
+++ b/jstests/core/index/index_check7.js
diff --git a/jstests/core/index_decimal.js b/jstests/core/index/index_decimal.js
index 01cd343b2a4..01cd343b2a4 100644
--- a/jstests/core/index_decimal.js
+++ b/jstests/core/index/index_decimal.js
diff --git a/jstests/core/index_diag.js b/jstests/core/index/index_diag.js
index 769e5575bf1..769e5575bf1 100644
--- a/jstests/core/index_diag.js
+++ b/jstests/core/index/index_diag.js
diff --git a/jstests/core/index_filter_catalog_independent.js b/jstests/core/index/index_filter_catalog_independent.js
index 2c244fdb070..2c244fdb070 100644
--- a/jstests/core/index_filter_catalog_independent.js
+++ b/jstests/core/index/index_filter_catalog_independent.js
diff --git a/jstests/core/index_filter_collation.js b/jstests/core/index/index_filter_collation.js
index b1b3edaa3d0..b1b3edaa3d0 100644
--- a/jstests/core/index_filter_collation.js
+++ b/jstests/core/index/index_filter_collation.js
diff --git a/jstests/core/index_filter_commands.js b/jstests/core/index/index_filter_commands.js
index 1272cb2fd19..1272cb2fd19 100644
--- a/jstests/core/index_filter_commands.js
+++ b/jstests/core/index/index_filter_commands.js
diff --git a/jstests/core/index_filter_commands_invalidate_plan_cache_entries.js b/jstests/core/index/index_filter_commands_invalidate_plan_cache_entries.js
index 059241284ac..059241284ac 100644
--- a/jstests/core/index_filter_commands_invalidate_plan_cache_entries.js
+++ b/jstests/core/index/index_filter_commands_invalidate_plan_cache_entries.js
diff --git a/jstests/core/index_filter_on_hidden_index.js b/jstests/core/index/index_filter_on_hidden_index.js
index 770802b8b3e..770802b8b3e 100644
--- a/jstests/core/index_filter_on_hidden_index.js
+++ b/jstests/core/index/index_filter_on_hidden_index.js
diff --git a/jstests/core/index_id_options.js b/jstests/core/index/index_id_options.js
index ca19627a48e..ca19627a48e 100644
--- a/jstests/core/index_id_options.js
+++ b/jstests/core/index/index_id_options.js
diff --git a/jstests/core/index_large_and_small_dates.js b/jstests/core/index/index_large_and_small_dates.js
index 5a89720c1b9..5a89720c1b9 100644
--- a/jstests/core/index_large_and_small_dates.js
+++ b/jstests/core/index/index_large_and_small_dates.js
diff --git a/jstests/core/index_many.js b/jstests/core/index/index_many.js
index cdd559c9be5..cdd559c9be5 100644
--- a/jstests/core/index_many.js
+++ b/jstests/core/index/index_many.js
diff --git a/jstests/core/index_many2.js b/jstests/core/index/index_many2.js
index a92da63c406..a92da63c406 100644
--- a/jstests/core/index_many2.js
+++ b/jstests/core/index/index_many2.js
diff --git a/jstests/core/index_multikey.js b/jstests/core/index/index_multikey.js
index 9dc26c9c13b..9dc26c9c13b 100644
--- a/jstests/core/index_multikey.js
+++ b/jstests/core/index/index_multikey.js
diff --git a/jstests/core/index_multiple_compatibility.js b/jstests/core/index/index_multiple_compatibility.js
index 5a2a599f536..5a2a599f536 100644
--- a/jstests/core/index_multiple_compatibility.js
+++ b/jstests/core/index/index_multiple_compatibility.js
diff --git a/jstests/core/index_partial_2dsphere.js b/jstests/core/index/index_partial_2dsphere.js
index 158a3ce3546..158a3ce3546 100644
--- a/jstests/core/index_partial_2dsphere.js
+++ b/jstests/core/index/index_partial_2dsphere.js
diff --git a/jstests/core/index_partial_create_drop.js b/jstests/core/index/index_partial_create_drop.js
index c0a095b30df..c0a095b30df 100644
--- a/jstests/core/index_partial_create_drop.js
+++ b/jstests/core/index/index_partial_create_drop.js
diff --git a/jstests/core/index_partial_read_ops.js b/jstests/core/index/index_partial_read_ops.js
index 2bc6578479e..2bc6578479e 100644
--- a/jstests/core/index_partial_read_ops.js
+++ b/jstests/core/index/index_partial_read_ops.js
diff --git a/jstests/core/index_partial_validate.js b/jstests/core/index/index_partial_validate.js
index 14a8c7a8d82..14a8c7a8d82 100644
--- a/jstests/core/index_partial_validate.js
+++ b/jstests/core/index/index_partial_validate.js
diff --git a/jstests/core/index_partial_write_ops.js b/jstests/core/index/index_partial_write_ops.js
index c98cb9a9310..c98cb9a9310 100644
--- a/jstests/core/index_partial_write_ops.js
+++ b/jstests/core/index/index_partial_write_ops.js
diff --git a/jstests/core/index_plugins.js b/jstests/core/index/index_plugins.js
index e535d189e6c..e535d189e6c 100644
--- a/jstests/core/index_plugins.js
+++ b/jstests/core/index/index_plugins.js
diff --git a/jstests/core/index_signature.js b/jstests/core/index/index_signature.js
index c4028d17376..c4028d17376 100644
--- a/jstests/core/index_signature.js
+++ b/jstests/core/index/index_signature.js
diff --git a/jstests/core/index_sort_within_multiple_point_ranges.js b/jstests/core/index/index_sort_within_multiple_point_ranges.js
index 6caaad1cb6f..6caaad1cb6f 100644
--- a/jstests/core/index_sort_within_multiple_point_ranges.js
+++ b/jstests/core/index/index_sort_within_multiple_point_ranges.js
diff --git a/jstests/core/index_sparse1.js b/jstests/core/index/index_sparse1.js
index 58bc5baa9b8..58bc5baa9b8 100644
--- a/jstests/core/index_sparse1.js
+++ b/jstests/core/index/index_sparse1.js
diff --git a/jstests/core/index_sparse2.js b/jstests/core/index/index_sparse2.js
index 324b46d8216..324b46d8216 100644
--- a/jstests/core/index_sparse2.js
+++ b/jstests/core/index/index_sparse2.js
diff --git a/jstests/core/index_stats.js b/jstests/core/index/index_stats.js
index b7e3e64d324..b7e3e64d324 100644
--- a/jstests/core/index_stats.js
+++ b/jstests/core/index/index_stats.js
diff --git a/jstests/core/index_type_change.js b/jstests/core/index/index_type_change.js
index 455d9b6067d..455d9b6067d 100644
--- a/jstests/core/index_type_change.js
+++ b/jstests/core/index/index_type_change.js
diff --git a/jstests/core/indexa.js b/jstests/core/index/indexa.js
index 01fde035621..01fde035621 100644
--- a/jstests/core/indexa.js
+++ b/jstests/core/index/indexa.js
diff --git a/jstests/core/indexapi.js b/jstests/core/index/indexapi.js
index 1b7016ea787..1b7016ea787 100644
--- a/jstests/core/indexapi.js
+++ b/jstests/core/index/indexapi.js
diff --git a/jstests/core/indexb.js b/jstests/core/index/indexb.js
index 59546f7fae2..59546f7fae2 100644
--- a/jstests/core/indexb.js
+++ b/jstests/core/index/indexb.js
diff --git a/jstests/core/indexc.js b/jstests/core/index/indexc.js
index bf5735380fa..bf5735380fa 100644
--- a/jstests/core/indexc.js
+++ b/jstests/core/index/indexc.js
diff --git a/jstests/core/indexe.js b/jstests/core/index/indexe.js
index a307882adc3..a307882adc3 100644
--- a/jstests/core/indexe.js
+++ b/jstests/core/index/indexe.js
diff --git a/jstests/core/indexes_multiple_commands.js b/jstests/core/index/indexes_multiple_commands.js
index 6c9c8b8a446..6c9c8b8a446 100644
--- a/jstests/core/indexes_multiple_commands.js
+++ b/jstests/core/index/indexes_multiple_commands.js
diff --git a/jstests/core/indexf.js b/jstests/core/index/indexf.js
index 37c27967229..37c27967229 100644
--- a/jstests/core/indexf.js
+++ b/jstests/core/index/indexf.js
diff --git a/jstests/core/indexg.js b/jstests/core/index/indexg.js
index 486f4be0ebe..486f4be0ebe 100644
--- a/jstests/core/indexg.js
+++ b/jstests/core/index/indexg.js
diff --git a/jstests/core/indexj.js b/jstests/core/index/indexj.js
index 3023b661e59..3023b661e59 100644
--- a/jstests/core/indexj.js
+++ b/jstests/core/index/indexj.js
diff --git a/jstests/core/indexl.js b/jstests/core/index/indexl.js
index cde169eda71..cde169eda71 100644
--- a/jstests/core/indexl.js
+++ b/jstests/core/index/indexl.js
diff --git a/jstests/core/indexm.js b/jstests/core/index/indexm.js
index 7613b125357..7613b125357 100644
--- a/jstests/core/indexm.js
+++ b/jstests/core/index/indexm.js
diff --git a/jstests/core/indexn.js b/jstests/core/index/indexn.js
index a292ae2e5d3..a292ae2e5d3 100644
--- a/jstests/core/indexn.js
+++ b/jstests/core/index/indexn.js
diff --git a/jstests/core/indexp.js b/jstests/core/index/indexp.js
index 8199e0f132c..8199e0f132c 100644
--- a/jstests/core/indexp.js
+++ b/jstests/core/index/indexp.js
diff --git a/jstests/core/indexr.js b/jstests/core/index/indexr.js
index d3ff5f7e02e..d3ff5f7e02e 100644
--- a/jstests/core/indexr.js
+++ b/jstests/core/index/indexr.js
diff --git a/jstests/core/indexs.js b/jstests/core/index/indexs.js
index 6ee625071e2..6ee625071e2 100644
--- a/jstests/core/indexs.js
+++ b/jstests/core/index/indexs.js
diff --git a/jstests/core/indext.js b/jstests/core/index/indext.js
index 1ac92d6be5d..1ac92d6be5d 100644
--- a/jstests/core/indext.js
+++ b/jstests/core/index/indext.js
diff --git a/jstests/core/indexu.js b/jstests/core/index/indexu.js
index df4d12fba5b..df4d12fba5b 100644
--- a/jstests/core/indexu.js
+++ b/jstests/core/index/indexu.js
diff --git a/jstests/core/unique_index_insert.js b/jstests/core/index/unique_index_insert.js
index 32495406f63..32495406f63 100644
--- a/jstests/core/unique_index_insert.js
+++ b/jstests/core/index/unique_index_insert.js
diff --git a/jstests/core/useindexonobjgtlt.js b/jstests/core/index/useindexonobjgtlt.js
index 7b393de7c2f..7b393de7c2f 100644
--- a/jstests/core/useindexonobjgtlt.js
+++ b/jstests/core/index/useindexonobjgtlt.js
diff --git a/jstests/core/wildcard_and_text_indexes.js b/jstests/core/index/wildcard/wildcard_and_text_indexes.js
index a3c2d9b9b88..a3c2d9b9b88 100644
--- a/jstests/core/wildcard_and_text_indexes.js
+++ b/jstests/core/index/wildcard/wildcard_and_text_indexes.js
diff --git a/jstests/core/wildcard_index_basic_index_bounds.js b/jstests/core/index/wildcard/wildcard_index_basic_index_bounds.js
index 94a13d9e8ed..94a13d9e8ed 100644
--- a/jstests/core/wildcard_index_basic_index_bounds.js
+++ b/jstests/core/index/wildcard/wildcard_index_basic_index_bounds.js
diff --git a/jstests/core/wildcard_index_cached_plans.js b/jstests/core/index/wildcard/wildcard_index_cached_plans.js
index f3a41f5361e..f3a41f5361e 100644
--- a/jstests/core/wildcard_index_cached_plans.js
+++ b/jstests/core/index/wildcard/wildcard_index_cached_plans.js
diff --git a/jstests/core/wildcard_index_collation.js b/jstests/core/index/wildcard/wildcard_index_collation.js
index cf5fcf33957..cf5fcf33957 100644
--- a/jstests/core/wildcard_index_collation.js
+++ b/jstests/core/index/wildcard/wildcard_index_collation.js
diff --git a/jstests/core/wildcard_index_count.js b/jstests/core/index/wildcard/wildcard_index_count.js
index 36c12897bb1..36c12897bb1 100644
--- a/jstests/core/wildcard_index_count.js
+++ b/jstests/core/index/wildcard/wildcard_index_count.js
diff --git a/jstests/core/wildcard_index_covered_queries.js b/jstests/core/index/wildcard/wildcard_index_covered_queries.js
index 3d8e0eec54b..3d8e0eec54b 100644
--- a/jstests/core/wildcard_index_covered_queries.js
+++ b/jstests/core/index/wildcard/wildcard_index_covered_queries.js
diff --git a/jstests/core/wildcard_index_dedup.js b/jstests/core/index/wildcard/wildcard_index_dedup.js
index 093d3e9d219..093d3e9d219 100644
--- a/jstests/core/wildcard_index_dedup.js
+++ b/jstests/core/index/wildcard/wildcard_index_dedup.js
diff --git a/jstests/core/wildcard_index_distinct_scan.js b/jstests/core/index/wildcard/wildcard_index_distinct_scan.js
index e56f81d5b62..e56f81d5b62 100644
--- a/jstests/core/wildcard_index_distinct_scan.js
+++ b/jstests/core/index/wildcard/wildcard_index_distinct_scan.js
diff --git a/jstests/core/wildcard_index_empty_arrays.js b/jstests/core/index/wildcard/wildcard_index_empty_arrays.js
index b1188594621..b1188594621 100644
--- a/jstests/core/wildcard_index_empty_arrays.js
+++ b/jstests/core/index/wildcard/wildcard_index_empty_arrays.js
diff --git a/jstests/core/wildcard_index_equality_to_empty_obj.js b/jstests/core/index/wildcard/wildcard_index_equality_to_empty_obj.js
index c6801bcdcb6..c6801bcdcb6 100644
--- a/jstests/core/wildcard_index_equality_to_empty_obj.js
+++ b/jstests/core/index/wildcard/wildcard_index_equality_to_empty_obj.js
diff --git a/jstests/core/wildcard_index_filter.js b/jstests/core/index/wildcard/wildcard_index_filter.js
index 879e245c422..879e245c422 100644
--- a/jstests/core/wildcard_index_filter.js
+++ b/jstests/core/index/wildcard/wildcard_index_filter.js
diff --git a/jstests/core/wildcard_index_hint.js b/jstests/core/index/wildcard/wildcard_index_hint.js
index 6ddca33fcb8..6ddca33fcb8 100644
--- a/jstests/core/wildcard_index_hint.js
+++ b/jstests/core/index/wildcard/wildcard_index_hint.js
diff --git a/jstests/core/wildcard_index_minmax.js b/jstests/core/index/wildcard/wildcard_index_minmax.js
index f7baf8a0713..f7baf8a0713 100644
--- a/jstests/core/wildcard_index_minmax.js
+++ b/jstests/core/index/wildcard/wildcard_index_minmax.js
diff --git a/jstests/core/wildcard_index_multikey.js b/jstests/core/index/wildcard/wildcard_index_multikey.js
index 3263ce4a44e..3263ce4a44e 100644
--- a/jstests/core/wildcard_index_multikey.js
+++ b/jstests/core/index/wildcard/wildcard_index_multikey.js
diff --git a/jstests/core/wildcard_index_nonblocking_sort.js b/jstests/core/index/wildcard/wildcard_index_nonblocking_sort.js
index c0cada14004..c0cada14004 100644
--- a/jstests/core/wildcard_index_nonblocking_sort.js
+++ b/jstests/core/index/wildcard/wildcard_index_nonblocking_sort.js
diff --git a/jstests/core/wildcard_index_partial_index.js b/jstests/core/index/wildcard/wildcard_index_partial_index.js
index 91be5f0c6fe..91be5f0c6fe 100644
--- a/jstests/core/wildcard_index_partial_index.js
+++ b/jstests/core/index/wildcard/wildcard_index_partial_index.js
diff --git a/jstests/core/wildcard_index_projection.js b/jstests/core/index/wildcard/wildcard_index_projection.js
index a7fde8e57d8..a7fde8e57d8 100644
--- a/jstests/core/wildcard_index_projection.js
+++ b/jstests/core/index/wildcard/wildcard_index_projection.js
diff --git a/jstests/core/wildcard_index_return_key.js b/jstests/core/index/wildcard/wildcard_index_return_key.js
index 53f7da8c09c..53f7da8c09c 100644
--- a/jstests/core/wildcard_index_return_key.js
+++ b/jstests/core/index/wildcard/wildcard_index_return_key.js
diff --git a/jstests/core/wildcard_index_type.js b/jstests/core/index/wildcard/wildcard_index_type.js
index 9225b97c34f..9225b97c34f 100644
--- a/jstests/core/wildcard_index_type.js
+++ b/jstests/core/index/wildcard/wildcard_index_type.js
diff --git a/jstests/core/wildcard_index_validindex.js b/jstests/core/index/wildcard/wildcard_index_validindex.js
index 6f61980bf55..6f61980bf55 100644
--- a/jstests/core/wildcard_index_validindex.js
+++ b/jstests/core/index/wildcard/wildcard_index_validindex.js
diff --git a/jstests/core/add_skip_stage_before_fetch.js b/jstests/core/query/add_skip_stage_before_fetch.js
index bef29a795e6..bef29a795e6 100644
--- a/jstests/core/add_skip_stage_before_fetch.js
+++ b/jstests/core/query/add_skip_stage_before_fetch.js
diff --git a/jstests/core/agg_hint.js b/jstests/core/query/agg_hint.js
index 8bc2748e228..8bc2748e228 100644
--- a/jstests/core/agg_hint.js
+++ b/jstests/core/query/agg_hint.js
diff --git a/jstests/core/all.js b/jstests/core/query/all/all.js
index a718e2615e8..a718e2615e8 100644
--- a/jstests/core/all.js
+++ b/jstests/core/query/all/all.js
diff --git a/jstests/core/all2.js b/jstests/core/query/all/all2.js
index b0c6d40cf68..b0c6d40cf68 100644
--- a/jstests/core/all2.js
+++ b/jstests/core/query/all/all2.js
diff --git a/jstests/core/all3.js b/jstests/core/query/all/all3.js
index 37cb6c690b2..37cb6c690b2 100644
--- a/jstests/core/all3.js
+++ b/jstests/core/query/all/all3.js
diff --git a/jstests/core/all4.js b/jstests/core/query/all/all4.js
index eb979289496..eb979289496 100644
--- a/jstests/core/all4.js
+++ b/jstests/core/query/all/all4.js
diff --git a/jstests/core/all5.js b/jstests/core/query/all/all5.js
index a5faaa1767f..a5faaa1767f 100644
--- a/jstests/core/all5.js
+++ b/jstests/core/query/all/all5.js
diff --git a/jstests/core/always_true_false.js b/jstests/core/query/always_true_false.js
index 9f6110d29e5..9f6110d29e5 100644
--- a/jstests/core/always_true_false.js
+++ b/jstests/core/query/always_true_false.js
diff --git a/jstests/core/and.js b/jstests/core/query/and/and.js
index 20fd583c31f..20fd583c31f 100644
--- a/jstests/core/and.js
+++ b/jstests/core/query/and/and.js
diff --git a/jstests/core/and2.js b/jstests/core/query/and/and2.js
index 5a946c2cb76..5a946c2cb76 100644
--- a/jstests/core/and2.js
+++ b/jstests/core/query/and/and2.js
diff --git a/jstests/core/and3.js b/jstests/core/query/and/and3.js
index 5256237bc33..5256237bc33 100644
--- a/jstests/core/and3.js
+++ b/jstests/core/query/and/and3.js
diff --git a/jstests/core/and_or_index_sort.js b/jstests/core/query/and/and_or_index_sort.js
index 4503ddb5741..4503ddb5741 100644
--- a/jstests/core/and_or_index_sort.js
+++ b/jstests/core/query/and/and_or_index_sort.js
diff --git a/jstests/core/and_or_nested.js b/jstests/core/query/and/and_or_nested.js
index 4ef411b36b3..4ef411b36b3 100644
--- a/jstests/core/and_or_nested.js
+++ b/jstests/core/query/and/and_or_nested.js
diff --git a/jstests/core/andor.js b/jstests/core/query/and/andor.js
index 5bac12d83ca..5bac12d83ca 100644
--- a/jstests/core/andor.js
+++ b/jstests/core/query/and/andor.js
diff --git a/jstests/core/array1.js b/jstests/core/query/array/array1.js
index d25b609f3d3..d25b609f3d3 100644
--- a/jstests/core/array1.js
+++ b/jstests/core/query/array/array1.js
diff --git a/jstests/core/array3.js b/jstests/core/query/array/array3.js
index 42acdfb6d3e..42acdfb6d3e 100644
--- a/jstests/core/array3.js
+++ b/jstests/core/query/array/array3.js
diff --git a/jstests/core/array4.js b/jstests/core/query/array/array4.js
index 9a006fa33bc..9a006fa33bc 100644
--- a/jstests/core/array4.js
+++ b/jstests/core/query/array/array4.js
diff --git a/jstests/core/array_comparison_correctness.js b/jstests/core/query/array/array_comparison_correctness.js
index 5fb1e6bad0e..5fb1e6bad0e 100644
--- a/jstests/core/array_comparison_correctness.js
+++ b/jstests/core/query/array/array_comparison_correctness.js
diff --git a/jstests/core/array_index_and_nonIndex_consistent.js b/jstests/core/query/array/array_index_and_nonIndex_consistent.js
index 5c8977f0d5b..5c8977f0d5b 100644
--- a/jstests/core/array_index_and_nonIndex_consistent.js
+++ b/jstests/core/query/array/array_index_and_nonIndex_consistent.js
diff --git a/jstests/core/array_match1.js b/jstests/core/query/array/array_match1.js
index 0c56e8d4c34..0c56e8d4c34 100644
--- a/jstests/core/array_match1.js
+++ b/jstests/core/query/array/array_match1.js
diff --git a/jstests/core/array_match2.js b/jstests/core/query/array/array_match2.js
index 3e0dde8f5f5..3e0dde8f5f5 100644
--- a/jstests/core/array_match2.js
+++ b/jstests/core/query/array/array_match2.js
diff --git a/jstests/core/array_match3.js b/jstests/core/query/array/array_match3.js
index 4990bdd90fd..4990bdd90fd 100644
--- a/jstests/core/array_match3.js
+++ b/jstests/core/query/array/array_match3.js
diff --git a/jstests/core/array_match4.js b/jstests/core/query/array/array_match4.js
index 1d6a879c1db..1d6a879c1db 100644
--- a/jstests/core/array_match4.js
+++ b/jstests/core/query/array/array_match4.js
diff --git a/jstests/core/arrayfind1.js b/jstests/core/query/array/arrayfind1.js
index 4e9330549ae..4e9330549ae 100644
--- a/jstests/core/arrayfind1.js
+++ b/jstests/core/query/array/arrayfind1.js
diff --git a/jstests/core/arrayfind10.js b/jstests/core/query/array/arrayfind10.js
index 6a3243d96eb..6a3243d96eb 100644
--- a/jstests/core/arrayfind10.js
+++ b/jstests/core/query/array/arrayfind10.js
diff --git a/jstests/core/arrayfind2.js b/jstests/core/query/array/arrayfind2.js
index 38de844f6f4..38de844f6f4 100644
--- a/jstests/core/arrayfind2.js
+++ b/jstests/core/query/array/arrayfind2.js
diff --git a/jstests/core/arrayfind3.js b/jstests/core/query/array/arrayfind3.js
index 6dba0bf625f..6dba0bf625f 100644
--- a/jstests/core/arrayfind3.js
+++ b/jstests/core/query/array/arrayfind3.js
diff --git a/jstests/core/arrayfind4.js b/jstests/core/query/array/arrayfind4.js
index 2d7c0e03668..2d7c0e03668 100644
--- a/jstests/core/arrayfind4.js
+++ b/jstests/core/query/array/arrayfind4.js
diff --git a/jstests/core/arrayfind5.js b/jstests/core/query/array/arrayfind5.js
index 004231e0893..004231e0893 100644
--- a/jstests/core/arrayfind5.js
+++ b/jstests/core/query/array/arrayfind5.js
diff --git a/jstests/core/arrayfind6.js b/jstests/core/query/array/arrayfind6.js
index bd91859c9dc..bd91859c9dc 100644
--- a/jstests/core/arrayfind6.js
+++ b/jstests/core/query/array/arrayfind6.js
diff --git a/jstests/core/arrayfind7.js b/jstests/core/query/array/arrayfind7.js
index be2061c5c0d..be2061c5c0d 100644
--- a/jstests/core/arrayfind7.js
+++ b/jstests/core/query/array/arrayfind7.js
diff --git a/jstests/core/arrayfind8.js b/jstests/core/query/array/arrayfind8.js
index 087410efab2..087410efab2 100644
--- a/jstests/core/arrayfind8.js
+++ b/jstests/core/query/array/arrayfind8.js
diff --git a/jstests/core/arrayfind9.js b/jstests/core/query/array/arrayfind9.js
index 5406ae8c1d1..5406ae8c1d1 100644
--- a/jstests/core/arrayfind9.js
+++ b/jstests/core/query/array/arrayfind9.js
diff --git a/jstests/core/arrayfinda.js b/jstests/core/query/array/arrayfinda.js
index 163af3d8d29..163af3d8d29 100644
--- a/jstests/core/arrayfinda.js
+++ b/jstests/core/query/array/arrayfinda.js
diff --git a/jstests/core/arrayfindb.js b/jstests/core/query/array/arrayfindb.js
index 51fa22f6dff..51fa22f6dff 100644
--- a/jstests/core/arrayfindb.js
+++ b/jstests/core/query/array/arrayfindb.js
diff --git a/jstests/core/awaitdata_getmore_cmd.js b/jstests/core/query/awaitdata_getmore_cmd.js
index 5efcf6590ef..5efcf6590ef 100644
--- a/jstests/core/awaitdata_getmore_cmd.js
+++ b/jstests/core/query/awaitdata_getmore_cmd.js
diff --git a/jstests/core/basic1.js b/jstests/core/query/basic1.js
index cc2917fb5a3..cc2917fb5a3 100644
--- a/jstests/core/basic1.js
+++ b/jstests/core/query/basic1.js
diff --git a/jstests/core/basic2.js b/jstests/core/query/basic2.js
index 3500d9fbdb5..3500d9fbdb5 100644
--- a/jstests/core/basic2.js
+++ b/jstests/core/query/basic2.js
diff --git a/jstests/core/basic4.js b/jstests/core/query/basic4.js
index 4b2cf6f96be..4b2cf6f96be 100644
--- a/jstests/core/basic4.js
+++ b/jstests/core/query/basic4.js
diff --git a/jstests/core/basic5.js b/jstests/core/query/basic5.js
index 7ec41ef7872..7ec41ef7872 100644
--- a/jstests/core/basic5.js
+++ b/jstests/core/query/basic5.js
diff --git a/jstests/core/basic6.js b/jstests/core/query/basic6.js
index 89aef4acc2e..89aef4acc2e 100644
--- a/jstests/core/basic6.js
+++ b/jstests/core/query/basic6.js
diff --git a/jstests/core/basic7.js b/jstests/core/query/basic7.js
index dc6f18cc95b..dc6f18cc95b 100644
--- a/jstests/core/basic7.js
+++ b/jstests/core/query/basic7.js
diff --git a/jstests/core/basic8.js b/jstests/core/query/basic8.js
index 4a35de6963b..4a35de6963b 100644
--- a/jstests/core/basic8.js
+++ b/jstests/core/query/basic8.js
diff --git a/jstests/core/basica.js b/jstests/core/query/basica.js
index 1fe8b7c5de4..1fe8b7c5de4 100644
--- a/jstests/core/basica.js
+++ b/jstests/core/query/basica.js
diff --git a/jstests/core/batch_size.js b/jstests/core/query/batch_size.js
index 833f294abb2..833f294abb2 100644
--- a/jstests/core/batch_size.js
+++ b/jstests/core/query/batch_size.js
diff --git a/jstests/core/bindata_eq.js b/jstests/core/query/bindata_eq.js
index fec80516f9b..fec80516f9b 100644
--- a/jstests/core/bindata_eq.js
+++ b/jstests/core/query/bindata_eq.js
diff --git a/jstests/core/bittest.js b/jstests/core/query/bittest.js
index a4a7272ae28..a4a7272ae28 100644
--- a/jstests/core/bittest.js
+++ b/jstests/core/query/bittest.js
diff --git a/jstests/core/collation_with_reverse_index.js b/jstests/core/query/collation_with_reverse_index.js
index d586038b8b8..d586038b8b8 100644
--- a/jstests/core/collation_with_reverse_index.js
+++ b/jstests/core/query/collation_with_reverse_index.js
diff --git a/jstests/core/collection_uuid_find.js b/jstests/core/query/collection_uuid_find.js
index 241435c1350..241435c1350 100644
--- a/jstests/core/collection_uuid_find.js
+++ b/jstests/core/query/collection_uuid_find.js
diff --git a/jstests/core/count.js b/jstests/core/query/count/count.js
index 76b858c17b9..76b858c17b9 100644
--- a/jstests/core/count.js
+++ b/jstests/core/query/count/count.js
diff --git a/jstests/core/count10.js b/jstests/core/query/count/count10.js
index c981e45a9b8..c981e45a9b8 100644
--- a/jstests/core/count10.js
+++ b/jstests/core/query/count/count10.js
diff --git a/jstests/core/count11.js b/jstests/core/query/count/count11.js
index f7eb398c6cb..f7eb398c6cb 100644
--- a/jstests/core/count11.js
+++ b/jstests/core/query/count/count11.js
diff --git a/jstests/core/count2.js b/jstests/core/query/count/count2.js
index 21aa75aebd0..21aa75aebd0 100644
--- a/jstests/core/count2.js
+++ b/jstests/core/query/count/count2.js
diff --git a/jstests/core/count3.js b/jstests/core/query/count/count3.js
index d93df020f0b..d93df020f0b 100644
--- a/jstests/core/count3.js
+++ b/jstests/core/query/count/count3.js
diff --git a/jstests/core/count4.js b/jstests/core/query/count/count4.js
index 01c06b7eedf..01c06b7eedf 100644
--- a/jstests/core/count4.js
+++ b/jstests/core/query/count/count4.js
diff --git a/jstests/core/count5.js b/jstests/core/query/count/count5.js
index ceedf62b336..ceedf62b336 100644
--- a/jstests/core/count5.js
+++ b/jstests/core/query/count/count5.js
diff --git a/jstests/core/count6.js b/jstests/core/query/count/count6.js
index 78735c89c26..78735c89c26 100644
--- a/jstests/core/count6.js
+++ b/jstests/core/query/count/count6.js
diff --git a/jstests/core/count7.js b/jstests/core/query/count/count7.js
index 443134474a8..443134474a8 100644
--- a/jstests/core/count7.js
+++ b/jstests/core/query/count/count7.js
diff --git a/jstests/core/count9.js b/jstests/core/query/count/count9.js
index 062f099e513..062f099e513 100644
--- a/jstests/core/count9.js
+++ b/jstests/core/query/count/count9.js
diff --git a/jstests/core/count_hint.js b/jstests/core/query/count/count_hint.js
index 5ba9514de87..5ba9514de87 100644
--- a/jstests/core/count_hint.js
+++ b/jstests/core/query/count/count_hint.js
diff --git a/jstests/core/count_plan_summary.js b/jstests/core/query/count/count_plan_summary.js
index f38e6f00a11..f38e6f00a11 100644
--- a/jstests/core/count_plan_summary.js
+++ b/jstests/core/query/count/count_plan_summary.js
diff --git a/jstests/core/counta.js b/jstests/core/query/count/counta.js
index 8d7df953e3d..8d7df953e3d 100644
--- a/jstests/core/counta.js
+++ b/jstests/core/query/count/counta.js
diff --git a/jstests/core/countb.js b/jstests/core/query/count/countb.js
index 869825b25a1..869825b25a1 100644
--- a/jstests/core/countb.js
+++ b/jstests/core/query/count/countb.js
diff --git a/jstests/core/countc.js b/jstests/core/query/count/countc.js
index 4afa7976931..4afa7976931 100644
--- a/jstests/core/countc.js
+++ b/jstests/core/query/count/countc.js
diff --git a/jstests/core/covered_multikey.js b/jstests/core/query/covered_multikey.js
index 9270a2b2c20..9270a2b2c20 100644
--- a/jstests/core/covered_multikey.js
+++ b/jstests/core/query/covered_multikey.js
diff --git a/jstests/core/aggregation_accepts_write_concern.js b/jstests/core/query/cursor/aggregation_accepts_write_concern.js
index 2c764414a1d..2c764414a1d 100644
--- a/jstests/core/aggregation_accepts_write_concern.js
+++ b/jstests/core/query/cursor/aggregation_accepts_write_concern.js
diff --git a/jstests/core/aggregation_getmore_batchsize.js b/jstests/core/query/cursor/aggregation_getmore_batchsize.js
index e33116cb4d5..e33116cb4d5 100644
--- a/jstests/core/aggregation_getmore_batchsize.js
+++ b/jstests/core/query/cursor/aggregation_getmore_batchsize.js
diff --git a/jstests/core/cursor1.js b/jstests/core/query/cursor/cursor1.js
index 1cb00cc82fb..1cb00cc82fb 100644
--- a/jstests/core/cursor1.js
+++ b/jstests/core/query/cursor/cursor1.js
diff --git a/jstests/core/cursor2.js b/jstests/core/query/cursor/cursor2.js
index 413383adcb7..413383adcb7 100644
--- a/jstests/core/cursor2.js
+++ b/jstests/core/query/cursor/cursor2.js
diff --git a/jstests/core/cursor3.js b/jstests/core/query/cursor/cursor3.js
index 8e5672d4b3b..8e5672d4b3b 100644
--- a/jstests/core/cursor3.js
+++ b/jstests/core/query/cursor/cursor3.js
diff --git a/jstests/core/cursor4.js b/jstests/core/query/cursor/cursor4.js
index d0440d329f1..d0440d329f1 100644
--- a/jstests/core/cursor4.js
+++ b/jstests/core/query/cursor/cursor4.js
diff --git a/jstests/core/cursor5.js b/jstests/core/query/cursor/cursor5.js
index aab03473255..aab03473255 100644
--- a/jstests/core/cursor5.js
+++ b/jstests/core/query/cursor/cursor5.js
diff --git a/jstests/core/cursor6.js b/jstests/core/query/cursor/cursor6.js
index dde1f9069cb..dde1f9069cb 100644
--- a/jstests/core/cursor6.js
+++ b/jstests/core/query/cursor/cursor6.js
diff --git a/jstests/core/cursor7.js b/jstests/core/query/cursor/cursor7.js
index 4a21c420274..4a21c420274 100644
--- a/jstests/core/cursor7.js
+++ b/jstests/core/query/cursor/cursor7.js
diff --git a/jstests/core/cursora.js b/jstests/core/query/cursor/cursora.js
index 4176e4d42fb..4176e4d42fb 100644
--- a/jstests/core/cursora.js
+++ b/jstests/core/query/cursor/cursora.js
diff --git a/jstests/core/getmore_cmd_maxtimems.js b/jstests/core/query/cursor/getmore_cmd_maxtimems.js
index 0b2b8c99561..0b2b8c99561 100644
--- a/jstests/core/getmore_cmd_maxtimems.js
+++ b/jstests/core/query/cursor/getmore_cmd_maxtimems.js
diff --git a/jstests/core/getmore_invalidated_cursors.js b/jstests/core/query/cursor/getmore_invalidated_cursors.js
index 4eca5fb297c..4eca5fb297c 100644
--- a/jstests/core/getmore_invalidated_cursors.js
+++ b/jstests/core/query/cursor/getmore_invalidated_cursors.js
diff --git a/jstests/core/getmore_invalidated_documents.js b/jstests/core/query/cursor/getmore_invalidated_documents.js
index d1d80b129ab..d1d80b129ab 100644
--- a/jstests/core/getmore_invalidated_documents.js
+++ b/jstests/core/query/cursor/getmore_invalidated_documents.js
diff --git a/jstests/core/tailable_cursor_invalidation.js b/jstests/core/query/cursor/tailable_cursor_invalidation.js
index d59e852d63d..d59e852d63d 100644
--- a/jstests/core/tailable_cursor_invalidation.js
+++ b/jstests/core/query/cursor/tailable_cursor_invalidation.js
diff --git a/jstests/core/tailable_getmore_batch_size.js b/jstests/core/query/cursor/tailable_getmore_batch_size.js
index f83980a44bd..f83980a44bd 100644
--- a/jstests/core/tailable_getmore_batch_size.js
+++ b/jstests/core/query/cursor/tailable_getmore_batch_size.js
diff --git a/jstests/core/tailable_skip_limit.js b/jstests/core/query/cursor/tailable_skip_limit.js
index 215378a5870..215378a5870 100644
--- a/jstests/core/tailable_skip_limit.js
+++ b/jstests/core/query/cursor/tailable_skip_limit.js
diff --git a/jstests/core/date1.js b/jstests/core/query/date/date1.js
index 65449c662b5..65449c662b5 100644
--- a/jstests/core/date1.js
+++ b/jstests/core/query/date/date1.js
diff --git a/jstests/core/date2.js b/jstests/core/query/date/date2.js
index a398058d771..a398058d771 100644
--- a/jstests/core/date2.js
+++ b/jstests/core/query/date/date2.js
diff --git a/jstests/core/date3.js b/jstests/core/query/date/date3.js
index e3eaea620ec..e3eaea620ec 100644
--- a/jstests/core/date3.js
+++ b/jstests/core/query/date/date3.js
diff --git a/jstests/core/dbref1.js b/jstests/core/query/dbref/dbref1.js
index b5bb06f230d..b5bb06f230d 100644
--- a/jstests/core/dbref1.js
+++ b/jstests/core/query/dbref/dbref1.js
diff --git a/jstests/core/dbref2.js b/jstests/core/query/dbref/dbref2.js
index be0deefeb2d..be0deefeb2d 100644
--- a/jstests/core/dbref2.js
+++ b/jstests/core/query/dbref/dbref2.js
diff --git a/jstests/core/dbref3.js b/jstests/core/query/dbref/dbref3.js
index a60ec42c576..a60ec42c576 100644
--- a/jstests/core/dbref3.js
+++ b/jstests/core/query/dbref/dbref3.js
diff --git a/jstests/core/dbref4.js b/jstests/core/query/dbref/dbref4.js
index 0de94028e39..0de94028e39 100644
--- a/jstests/core/dbref4.js
+++ b/jstests/core/query/dbref/dbref4.js
diff --git a/jstests/core/ref.js b/jstests/core/query/dbref/ref.js
index 0d1160482fc..0d1160482fc 100644
--- a/jstests/core/ref.js
+++ b/jstests/core/query/dbref/ref.js
diff --git a/jstests/core/ref2.js b/jstests/core/query/dbref/ref2.js
index 6b284b1f59f..6b284b1f59f 100644
--- a/jstests/core/ref2.js
+++ b/jstests/core/query/dbref/ref2.js
diff --git a/jstests/core/ref3.js b/jstests/core/query/dbref/ref3.js
index 4406863d899..4406863d899 100644
--- a/jstests/core/ref3.js
+++ b/jstests/core/query/dbref/ref3.js
diff --git a/jstests/core/ref4.js b/jstests/core/query/dbref/ref4.js
index 882253f3883..882253f3883 100644
--- a/jstests/core/ref4.js
+++ b/jstests/core/query/dbref/ref4.js
diff --git a/jstests/core/distinct1.js b/jstests/core/query/distinct/distinct1.js
index 090c5c506c4..090c5c506c4 100644
--- a/jstests/core/distinct1.js
+++ b/jstests/core/query/distinct/distinct1.js
diff --git a/jstests/core/distinct2.js b/jstests/core/query/distinct/distinct2.js
index fc6ff7779b7..fc6ff7779b7 100644
--- a/jstests/core/distinct2.js
+++ b/jstests/core/query/distinct/distinct2.js
diff --git a/jstests/core/distinct3.js b/jstests/core/query/distinct/distinct3.js
index c2aaaad79e5..c2aaaad79e5 100644
--- a/jstests/core/distinct3.js
+++ b/jstests/core/query/distinct/distinct3.js
diff --git a/jstests/core/distinct4.js b/jstests/core/query/distinct/distinct4.js
index a66022ecbaa..a66022ecbaa 100644
--- a/jstests/core/distinct4.js
+++ b/jstests/core/query/distinct/distinct4.js
diff --git a/jstests/core/distinct_array1.js b/jstests/core/query/distinct/distinct_array1.js
index cb82c25bbff..cb82c25bbff 100644
--- a/jstests/core/distinct_array1.js
+++ b/jstests/core/query/distinct/distinct_array1.js
diff --git a/jstests/core/distinct_compound_index.js b/jstests/core/query/distinct/distinct_compound_index.js
index dfca2d712f3..dfca2d712f3 100644
--- a/jstests/core/distinct_compound_index.js
+++ b/jstests/core/query/distinct/distinct_compound_index.js
diff --git a/jstests/core/distinct_index1.js b/jstests/core/query/distinct/distinct_index1.js
index 75a7f8adc22..75a7f8adc22 100644
--- a/jstests/core/distinct_index1.js
+++ b/jstests/core/query/distinct/distinct_index1.js
diff --git a/jstests/core/distinct_index2.js b/jstests/core/query/distinct/distinct_index2.js
index 3f73efe04d7..3f73efe04d7 100644
--- a/jstests/core/distinct_index2.js
+++ b/jstests/core/query/distinct/distinct_index2.js
diff --git a/jstests/core/distinct_multikey.js b/jstests/core/query/distinct/distinct_multikey.js
index 21d060bddf2..21d060bddf2 100644
--- a/jstests/core/distinct_multikey.js
+++ b/jstests/core/query/distinct/distinct_multikey.js
diff --git a/jstests/core/distinct_multikey_dotted_path.js b/jstests/core/query/distinct/distinct_multikey_dotted_path.js
index c8530fe6799..c8530fe6799 100644
--- a/jstests/core/distinct_multikey_dotted_path.js
+++ b/jstests/core/query/distinct/distinct_multikey_dotted_path.js
diff --git a/jstests/core/distinct_with_hashed_index.js b/jstests/core/query/distinct/distinct_with_hashed_index.js
index 8476c5c5f14..8476c5c5f14 100644
--- a/jstests/core/distinct_with_hashed_index.js
+++ b/jstests/core/query/distinct/distinct_with_hashed_index.js
diff --git a/jstests/core/dotted_path_in_null.js b/jstests/core/query/dotted_path_in_null.js
index 7c8baf42709..7c8baf42709 100644
--- a/jstests/core/dotted_path_in_null.js
+++ b/jstests/core/query/dotted_path_in_null.js
diff --git a/jstests/core/double_decimal_compare.js b/jstests/core/query/double_decimal_compare.js
index d7f5a32975e..d7f5a32975e 100644
--- a/jstests/core/double_decimal_compare.js
+++ b/jstests/core/query/double_decimal_compare.js
diff --git a/jstests/core/elemmatch_object.js b/jstests/core/query/elemmatch/elemmatch_object.js
index caa13b71ef9..caa13b71ef9 100644
--- a/jstests/core/elemmatch_object.js
+++ b/jstests/core/query/elemmatch/elemmatch_object.js
diff --git a/jstests/core/elemmatch_or_pushdown.js b/jstests/core/query/elemmatch/elemmatch_or_pushdown.js
index 2edef4d0678..2edef4d0678 100644
--- a/jstests/core/elemmatch_or_pushdown.js
+++ b/jstests/core/query/elemmatch/elemmatch_or_pushdown.js
diff --git a/jstests/core/elemmatch_projection.js b/jstests/core/query/elemmatch/elemmatch_projection.js
index b07f43fe0be..b07f43fe0be 100644
--- a/jstests/core/elemmatch_projection.js
+++ b/jstests/core/query/elemmatch/elemmatch_projection.js
diff --git a/jstests/core/elemmatch_value.js b/jstests/core/query/elemmatch/elemmatch_value.js
index d4e116f3bf9..d4e116f3bf9 100644
--- a/jstests/core/elemmatch_value.js
+++ b/jstests/core/query/elemmatch/elemmatch_value.js
diff --git a/jstests/core/exists.js b/jstests/core/query/exists/exists.js
index b85d80c36a7..b85d80c36a7 100644
--- a/jstests/core/exists.js
+++ b/jstests/core/query/exists/exists.js
diff --git a/jstests/core/exists2.js b/jstests/core/query/exists/exists2.js
index 0764d859c3b..0764d859c3b 100644
--- a/jstests/core/exists2.js
+++ b/jstests/core/query/exists/exists2.js
diff --git a/jstests/core/exists3.js b/jstests/core/query/exists/exists3.js
index 510d63c3752..510d63c3752 100644
--- a/jstests/core/exists3.js
+++ b/jstests/core/query/exists/exists3.js
diff --git a/jstests/core/exists4.js b/jstests/core/query/exists/exists4.js
index a533ca53e9c..a533ca53e9c 100644
--- a/jstests/core/exists4.js
+++ b/jstests/core/query/exists/exists4.js
diff --git a/jstests/core/exists5.js b/jstests/core/query/exists/exists5.js
index 2f4b1a9b8de..2f4b1a9b8de 100644
--- a/jstests/core/exists5.js
+++ b/jstests/core/query/exists/exists5.js
diff --git a/jstests/core/exists6.js b/jstests/core/query/exists/exists6.js
index 736574db895..736574db895 100644
--- a/jstests/core/exists6.js
+++ b/jstests/core/query/exists/exists6.js
diff --git a/jstests/core/exists7.js b/jstests/core/query/exists/exists7.js
index 285559e82f8..285559e82f8 100644
--- a/jstests/core/exists7.js
+++ b/jstests/core/query/exists/exists7.js
diff --git a/jstests/core/exists8.js b/jstests/core/query/exists/exists8.js
index f22a3be44f4..f22a3be44f4 100644
--- a/jstests/core/exists8.js
+++ b/jstests/core/query/exists/exists8.js
diff --git a/jstests/core/exists9.js b/jstests/core/query/exists/exists9.js
index c187bb3a101..c187bb3a101 100644
--- a/jstests/core/exists9.js
+++ b/jstests/core/query/exists/exists9.js
diff --git a/jstests/core/existsa.js b/jstests/core/query/exists/existsa.js
index 2b5f70dd77f..2b5f70dd77f 100644
--- a/jstests/core/existsa.js
+++ b/jstests/core/query/exists/existsa.js
diff --git a/jstests/core/existsb.js b/jstests/core/query/exists/existsb.js
index 64ee3cf9a88..64ee3cf9a88 100644
--- a/jstests/core/existsb.js
+++ b/jstests/core/query/exists/existsb.js
diff --git a/jstests/core/explain1.js b/jstests/core/query/explain/explain1.js
index 2de3e2f89d2..2de3e2f89d2 100644
--- a/jstests/core/explain1.js
+++ b/jstests/core/query/explain/explain1.js
diff --git a/jstests/core/explain4.js b/jstests/core/query/explain/explain4.js
index e49b188cb65..e49b188cb65 100644
--- a/jstests/core/explain4.js
+++ b/jstests/core/query/explain/explain4.js
diff --git a/jstests/core/explain5.js b/jstests/core/query/explain/explain5.js
index 534aaf9665b..534aaf9665b 100644
--- a/jstests/core/explain5.js
+++ b/jstests/core/query/explain/explain5.js
diff --git a/jstests/core/explain6.js b/jstests/core/query/explain/explain6.js
index fbb6ecf6d76..fbb6ecf6d76 100644
--- a/jstests/core/explain6.js
+++ b/jstests/core/query/explain/explain6.js
diff --git a/jstests/core/explain_agg_write_concern.js b/jstests/core/query/explain/explain_agg_write_concern.js
index 9ff556489fa..9ff556489fa 100644
--- a/jstests/core/explain_agg_write_concern.js
+++ b/jstests/core/query/explain/explain_agg_write_concern.js
diff --git a/jstests/core/explain_batch_size.js b/jstests/core/query/explain/explain_batch_size.js
index d31b54b3f16..d31b54b3f16 100644
--- a/jstests/core/explain_batch_size.js
+++ b/jstests/core/query/explain/explain_batch_size.js
diff --git a/jstests/core/explain_count.js b/jstests/core/query/explain/explain_count.js
index 8dc0854ab15..8dc0854ab15 100644
--- a/jstests/core/explain_count.js
+++ b/jstests/core/query/explain/explain_count.js
diff --git a/jstests/core/explain_db_mismatch.js b/jstests/core/query/explain/explain_db_mismatch.js
index 09950f489d0..09950f489d0 100644
--- a/jstests/core/explain_db_mismatch.js
+++ b/jstests/core/query/explain/explain_db_mismatch.js
diff --git a/jstests/core/explain_delete.js b/jstests/core/query/explain/explain_delete.js
index 2b2d7933531..2b2d7933531 100644
--- a/jstests/core/explain_delete.js
+++ b/jstests/core/query/explain/explain_delete.js
diff --git a/jstests/core/explain_distinct.js b/jstests/core/query/explain/explain_distinct.js
index 19059b8b1bd..19059b8b1bd 100644
--- a/jstests/core/explain_distinct.js
+++ b/jstests/core/query/explain/explain_distinct.js
diff --git a/jstests/core/explain_execution_error.js b/jstests/core/query/explain/explain_execution_error.js
index 6f11a555ba3..6f11a555ba3 100644
--- a/jstests/core/explain_execution_error.js
+++ b/jstests/core/query/explain/explain_execution_error.js
diff --git a/jstests/core/explain_find.js b/jstests/core/query/explain/explain_find.js
index a0578fd29c3..a0578fd29c3 100644
--- a/jstests/core/explain_find.js
+++ b/jstests/core/query/explain/explain_find.js
diff --git a/jstests/core/explain_find_and_modify.js b/jstests/core/query/explain/explain_find_and_modify.js
index 5809c94ce55..5809c94ce55 100644
--- a/jstests/core/explain_find_and_modify.js
+++ b/jstests/core/query/explain/explain_find_and_modify.js
diff --git a/jstests/core/explain_includes_command.js b/jstests/core/query/explain/explain_includes_command.js
index 9d52c34ee9a..9d52c34ee9a 100644
--- a/jstests/core/explain_includes_command.js
+++ b/jstests/core/query/explain/explain_includes_command.js
diff --git a/jstests/core/explain_large_bounds.js b/jstests/core/query/explain/explain_large_bounds.js
index c78de75992d..c78de75992d 100644
--- a/jstests/core/explain_large_bounds.js
+++ b/jstests/core/query/explain/explain_large_bounds.js
diff --git a/jstests/core/explain_missing_collection.js b/jstests/core/query/explain/explain_missing_collection.js
index 60cfb32675c..60cfb32675c 100644
--- a/jstests/core/explain_missing_collection.js
+++ b/jstests/core/query/explain/explain_missing_collection.js
diff --git a/jstests/core/explain_missing_database.js b/jstests/core/query/explain/explain_missing_database.js
index a1eb89e10e4..a1eb89e10e4 100644
--- a/jstests/core/explain_missing_database.js
+++ b/jstests/core/query/explain/explain_missing_database.js
diff --git a/jstests/core/explain_multi_plan.js b/jstests/core/query/explain/explain_multi_plan.js
index 45484510196..45484510196 100644
--- a/jstests/core/explain_multi_plan.js
+++ b/jstests/core/query/explain/explain_multi_plan.js
diff --git a/jstests/core/explain_multi_plan_count.js b/jstests/core/query/explain/explain_multi_plan_count.js
index 2ac52019cf3..2ac52019cf3 100644
--- a/jstests/core/explain_multi_plan_count.js
+++ b/jstests/core/query/explain/explain_multi_plan_count.js
diff --git a/jstests/core/explain_multikey.js b/jstests/core/query/explain/explain_multikey.js
index 9bea359edb4..9bea359edb4 100644
--- a/jstests/core/explain_multikey.js
+++ b/jstests/core/query/explain/explain_multikey.js
diff --git a/jstests/core/explain_plan_scores.js b/jstests/core/query/explain/explain_plan_scores.js
index 80788bd4558..80788bd4558 100644
--- a/jstests/core/explain_plan_scores.js
+++ b/jstests/core/query/explain/explain_plan_scores.js
diff --git a/jstests/core/explain_sample.js b/jstests/core/query/explain/explain_sample.js
index efb6d2b6f8a..efb6d2b6f8a 100644
--- a/jstests/core/explain_sample.js
+++ b/jstests/core/query/explain/explain_sample.js
diff --git a/jstests/core/explain_server_params.js b/jstests/core/query/explain/explain_server_params.js
index 512fcf2bbeb..512fcf2bbeb 100644
--- a/jstests/core/explain_server_params.js
+++ b/jstests/core/query/explain/explain_server_params.js
diff --git a/jstests/core/explain_shell_helpers.js b/jstests/core/query/explain/explain_shell_helpers.js
index 67b13b0b858..67b13b0b858 100644
--- a/jstests/core/explain_shell_helpers.js
+++ b/jstests/core/query/explain/explain_shell_helpers.js
diff --git a/jstests/core/explain_sort_type.js b/jstests/core/query/explain/explain_sort_type.js
index df4d91c0bbf..df4d91c0bbf 100644
--- a/jstests/core/explain_sort_type.js
+++ b/jstests/core/query/explain/explain_sort_type.js
diff --git a/jstests/core/explain_upsert.js b/jstests/core/query/explain/explain_upsert.js
index 6da5921b8f0..6da5921b8f0 100644
--- a/jstests/core/explain_upsert.js
+++ b/jstests/core/query/explain/explain_upsert.js
diff --git a/jstests/core/explain_uuid.js b/jstests/core/query/explain/explain_uuid.js
index 4f614799763..4f614799763 100644
--- a/jstests/core/explain_uuid.js
+++ b/jstests/core/query/explain/explain_uuid.js
diff --git a/jstests/core/explain_validation.js b/jstests/core/query/explain/explain_validation.js
index 2ebc19b3080..2ebc19b3080 100644
--- a/jstests/core/explain_validation.js
+++ b/jstests/core/query/explain/explain_validation.js
diff --git a/jstests/core/explain_winning_plan.js b/jstests/core/query/explain/explain_winning_plan.js
index cd0c62f9e43..cd0c62f9e43 100644
--- a/jstests/core/explain_winning_plan.js
+++ b/jstests/core/query/explain/explain_winning_plan.js
diff --git a/jstests/core/explain_writecmd_nonexistent_collection.js b/jstests/core/query/explain/explain_writecmd_nonexistent_collection.js
index 2496f4b63a0..2496f4b63a0 100644
--- a/jstests/core/explain_writecmd_nonexistent_collection.js
+++ b/jstests/core/query/explain/explain_writecmd_nonexistent_collection.js
diff --git a/jstests/core/explode_for_sort_fetch.js b/jstests/core/query/explode_for_sort_fetch.js
index 74a929ac60b..74a929ac60b 100644
--- a/jstests/core/explode_for_sort_fetch.js
+++ b/jstests/core/query/explode_for_sort_fetch.js
diff --git a/jstests/core/explode_for_sort_plan_cache.js b/jstests/core/query/explode_for_sort_plan_cache.js
index b6700c7c588..b6700c7c588 100644
--- a/jstests/core/explode_for_sort_plan_cache.js
+++ b/jstests/core/query/explode_for_sort_plan_cache.js
diff --git a/jstests/core/expr.js b/jstests/core/query/expr/expr.js
index 737cab39f15..737cab39f15 100644
--- a/jstests/core/expr.js
+++ b/jstests/core/query/expr/expr.js
diff --git a/jstests/core/expr_index_use.js b/jstests/core/query/expr/expr_index_use.js
index a0f85bc69c9..a0f85bc69c9 100644
--- a/jstests/core/expr_index_use.js
+++ b/jstests/core/query/expr/expr_index_use.js
diff --git a/jstests/core/expr_or_pushdown.js b/jstests/core/query/expr/expr_or_pushdown.js
index e2605e08c91..e2605e08c91 100644
--- a/jstests/core/expr_or_pushdown.js
+++ b/jstests/core/query/expr/expr_or_pushdown.js
diff --git a/jstests/core/expr_valid_positions.js b/jstests/core/query/expr/expr_valid_positions.js
index cd3ae2bf917..cd3ae2bf917 100644
--- a/jstests/core/expr_valid_positions.js
+++ b/jstests/core/query/expr/expr_valid_positions.js
diff --git a/jstests/core/expressions_matching_whole_array.js b/jstests/core/query/expressions_matching_whole_array.js
index a2727e7b9d6..a2727e7b9d6 100644
--- a/jstests/core/expressions_matching_whole_array.js
+++ b/jstests/core/query/expressions_matching_whole_array.js
diff --git a/jstests/core/find2.js b/jstests/core/query/find/find2.js
index a793c60b804..a793c60b804 100644
--- a/jstests/core/find2.js
+++ b/jstests/core/query/find/find2.js
diff --git a/jstests/core/find4.js b/jstests/core/query/find/find4.js
index 3d22f6d3fcb..3d22f6d3fcb 100644
--- a/jstests/core/find4.js
+++ b/jstests/core/query/find/find4.js
diff --git a/jstests/core/find5.js b/jstests/core/query/find/find5.js
index f5333654ab2..f5333654ab2 100644
--- a/jstests/core/find5.js
+++ b/jstests/core/query/find/find5.js
diff --git a/jstests/core/find6.js b/jstests/core/query/find/find6.js
index d76cc1d5fb5..d76cc1d5fb5 100644
--- a/jstests/core/find6.js
+++ b/jstests/core/query/find/find6.js
diff --git a/jstests/core/find7.js b/jstests/core/query/find/find7.js
index ed18dcbb0ff..ed18dcbb0ff 100644
--- a/jstests/core/find7.js
+++ b/jstests/core/query/find/find7.js
diff --git a/jstests/core/find8.js b/jstests/core/query/find/find8.js
index 14930a056e7..14930a056e7 100644
--- a/jstests/core/find8.js
+++ b/jstests/core/query/find/find8.js
diff --git a/jstests/core/find9.js b/jstests/core/query/find/find9.js
index be6bfdb2ccf..be6bfdb2ccf 100644
--- a/jstests/core/find9.js
+++ b/jstests/core/query/find/find9.js
diff --git a/jstests/core/find_covered_projection.js b/jstests/core/query/find/find_covered_projection.js
index c1e379bd8a3..c1e379bd8a3 100644
--- a/jstests/core/find_covered_projection.js
+++ b/jstests/core/query/find/find_covered_projection.js
diff --git a/jstests/core/find_dedup.js b/jstests/core/query/find/find_dedup.js
index 17a45f5873f..17a45f5873f 100644
--- a/jstests/core/find_dedup.js
+++ b/jstests/core/query/find/find_dedup.js
diff --git a/jstests/core/find_getmore_bsonsize.js b/jstests/core/query/find/find_getmore_bsonsize.js
index fb54a95d275..fb54a95d275 100644
--- a/jstests/core/find_getmore_bsonsize.js
+++ b/jstests/core/query/find/find_getmore_bsonsize.js
diff --git a/jstests/core/find_getmore_cmd.js b/jstests/core/query/find/find_getmore_cmd.js
index 594f6231730..594f6231730 100644
--- a/jstests/core/find_getmore_cmd.js
+++ b/jstests/core/query/find/find_getmore_cmd.js
diff --git a/jstests/core/find_project_sort.js b/jstests/core/query/find/find_project_sort.js
index 3d359fd9e41..3d359fd9e41 100644
--- a/jstests/core/find_project_sort.js
+++ b/jstests/core/query/find/find_project_sort.js
diff --git a/jstests/core/find_projection_meta_errors.js b/jstests/core/query/find/find_projection_meta_errors.js
index e6cf661255b..e6cf661255b 100644
--- a/jstests/core/find_projection_meta_errors.js
+++ b/jstests/core/query/find/find_projection_meta_errors.js
diff --git a/jstests/core/find_size.js b/jstests/core/query/find/find_size.js
index 14949f0f477..14949f0f477 100644
--- a/jstests/core/find_size.js
+++ b/jstests/core/query/find/find_size.js
diff --git a/jstests/core/finda.js b/jstests/core/query/find/finda.js
index d6f3a82827f..d6f3a82827f 100644
--- a/jstests/core/finda.js
+++ b/jstests/core/query/find/finda.js
diff --git a/jstests/core/idhack.js b/jstests/core/query/idhack.js
index e60bd9c8a50..e60bd9c8a50 100644
--- a/jstests/core/idhack.js
+++ b/jstests/core/query/idhack.js
diff --git a/jstests/core/in.js b/jstests/core/query/in/in.js
index ca8cd77b189..ca8cd77b189 100644
--- a/jstests/core/in.js
+++ b/jstests/core/query/in/in.js
diff --git a/jstests/core/in2.js b/jstests/core/query/in/in2.js
index 6682bbc79c1..6682bbc79c1 100644
--- a/jstests/core/in2.js
+++ b/jstests/core/query/in/in2.js
diff --git a/jstests/core/in3.js b/jstests/core/query/in/in3.js
index bd64329ded4..bd64329ded4 100644
--- a/jstests/core/in3.js
+++ b/jstests/core/query/in/in3.js
diff --git a/jstests/core/in4.js b/jstests/core/query/in/in4.js
index e916ca7c82d..e916ca7c82d 100644
--- a/jstests/core/in4.js
+++ b/jstests/core/query/in/in4.js
diff --git a/jstests/core/in5.js b/jstests/core/query/in/in5.js
index 80f37e6b473..80f37e6b473 100644
--- a/jstests/core/in5.js
+++ b/jstests/core/query/in/in5.js
diff --git a/jstests/core/in6.js b/jstests/core/query/in/in6.js
index ab8322cfe0a..ab8322cfe0a 100644
--- a/jstests/core/in6.js
+++ b/jstests/core/query/in/in6.js
diff --git a/jstests/core/in7.js b/jstests/core/query/in/in7.js
index 2f6c9e3ff1a..2f6c9e3ff1a 100644
--- a/jstests/core/in7.js
+++ b/jstests/core/query/in/in7.js
diff --git a/jstests/core/in8.js b/jstests/core/query/in/in8.js
index f1b6188347c..f1b6188347c 100644
--- a/jstests/core/in8.js
+++ b/jstests/core/query/in/in8.js
diff --git a/jstests/core/in_with_mixed_values.js b/jstests/core/query/in/in_with_mixed_values.js
index 6222c8e1db6..6222c8e1db6 100644
--- a/jstests/core/in_with_mixed_values.js
+++ b/jstests/core/query/in/in_with_mixed_values.js
diff --git a/jstests/core/inc-SERVER-7446.js b/jstests/core/query/inc/inc-SERVER-7446.js
index b1d5aa158d0..b1d5aa158d0 100644
--- a/jstests/core/inc-SERVER-7446.js
+++ b/jstests/core/query/inc/inc-SERVER-7446.js
diff --git a/jstests/core/inc1.js b/jstests/core/query/inc/inc1.js
index 551d15e0f63..551d15e0f63 100644
--- a/jstests/core/inc1.js
+++ b/jstests/core/query/inc/inc1.js
diff --git a/jstests/core/inc2.js b/jstests/core/query/inc/inc2.js
index debdfde82cb..debdfde82cb 100644
--- a/jstests/core/inc2.js
+++ b/jstests/core/query/inc/inc2.js
diff --git a/jstests/core/inc3.js b/jstests/core/query/inc/inc3.js
index e24165876c6..e24165876c6 100644
--- a/jstests/core/inc3.js
+++ b/jstests/core/query/inc/inc3.js
diff --git a/jstests/core/index_key_expression.js b/jstests/core/query/index_key_expression.js
index 6f9706998bd..6f9706998bd 100644
--- a/jstests/core/index_key_expression.js
+++ b/jstests/core/query/index_key_expression.js
diff --git a/jstests/core/internal_apply_oplog_update.js b/jstests/core/query/internal_apply_oplog_update.js
index 66f24403145..66f24403145 100644
--- a/jstests/core/internal_apply_oplog_update.js
+++ b/jstests/core/query/internal_apply_oplog_update.js
diff --git a/jstests/core/internal_rename_if_options_and_indexes_match.js b/jstests/core/query/internal_rename_if_options_and_indexes_match.js
index ac429eb678c..ac429eb678c 100644
--- a/jstests/core/internal_rename_if_options_and_indexes_match.js
+++ b/jstests/core/query/internal_rename_if_options_and_indexes_match.js
diff --git a/jstests/core/introspect_hidden_index_plan_cache_entries.js b/jstests/core/query/introspect_hidden_index_plan_cache_entries.js
index 1d56012bcbf..1d56012bcbf 100644
--- a/jstests/core/introspect_hidden_index_plan_cache_entries.js
+++ b/jstests/core/query/introspect_hidden_index_plan_cache_entries.js
diff --git a/jstests/core/invalid_collation_locale.js b/jstests/core/query/invalid_collation_locale.js
index d520aef5920..d520aef5920 100644
--- a/jstests/core/invalid_collation_locale.js
+++ b/jstests/core/query/invalid_collation_locale.js
diff --git a/jstests/core/invalid_db_name.js b/jstests/core/query/invalid_db_name.js
index 23cec76d446..23cec76d446 100644
--- a/jstests/core/invalid_db_name.js
+++ b/jstests/core/query/invalid_db_name.js
diff --git a/jstests/core/js1.js b/jstests/core/query/js/js1.js
index f569606ba54..f569606ba54 100644
--- a/jstests/core/js1.js
+++ b/jstests/core/query/js/js1.js
diff --git a/jstests/core/js2.js b/jstests/core/query/js/js2.js
index bd5379f7df1..bd5379f7df1 100644
--- a/jstests/core/js2.js
+++ b/jstests/core/query/js/js2.js
diff --git a/jstests/core/js3.js b/jstests/core/query/js/js3.js
index c9239bb4176..c9239bb4176 100644
--- a/jstests/core/js3.js
+++ b/jstests/core/query/js/js3.js
diff --git a/jstests/core/js4.js b/jstests/core/query/js/js4.js
index a8beab4a8f6..a8beab4a8f6 100644
--- a/jstests/core/js4.js
+++ b/jstests/core/query/js/js4.js
diff --git a/jstests/core/js5.js b/jstests/core/query/js/js5.js
index 05071a2b6a6..05071a2b6a6 100644
--- a/jstests/core/js5.js
+++ b/jstests/core/query/js/js5.js
diff --git a/jstests/core/js8.js b/jstests/core/query/js/js8.js
index 4bdf942e2c6..4bdf942e2c6 100644
--- a/jstests/core/js8.js
+++ b/jstests/core/query/js/js8.js
diff --git a/jstests/core/js9.js b/jstests/core/query/js/js9.js
index ec385475e1e..ec385475e1e 100644
--- a/jstests/core/js9.js
+++ b/jstests/core/query/js/js9.js
diff --git a/jstests/core/js_global_scope.js b/jstests/core/query/js/js_global_scope.js
index d78f435acd9..d78f435acd9 100644
--- a/jstests/core/js_global_scope.js
+++ b/jstests/core/query/js/js_global_scope.js
diff --git a/jstests/core/js_jit.js b/jstests/core/query/js/js_jit.js
index 72290d45758..72290d45758 100644
--- a/jstests/core/js_jit.js
+++ b/jstests/core/query/js/js_jit.js
diff --git a/jstests/core/js_object_properties.js b/jstests/core/query/js/js_object_properties.js
index 087d8555018..087d8555018 100644
--- a/jstests/core/js_object_properties.js
+++ b/jstests/core/query/js/js_object_properties.js
diff --git a/jstests/core/min_max_key.js b/jstests/core/query/min_max_key.js
index 9401fcf4467..9401fcf4467 100644
--- a/jstests/core/min_max_key.js
+++ b/jstests/core/query/min_max_key.js
diff --git a/jstests/core/minmax.js b/jstests/core/query/minmax.js
index fb16e718bca..fb16e718bca 100644
--- a/jstests/core/minmax.js
+++ b/jstests/core/query/minmax.js
diff --git a/jstests/core/minmax_edge.js b/jstests/core/query/minmax_edge.js
index 135d83337c3..135d83337c3 100644
--- a/jstests/core/minmax_edge.js
+++ b/jstests/core/query/minmax_edge.js
diff --git a/jstests/core/mr_agg_explain.js b/jstests/core/query/mr/mr_agg_explain.js
index 057b2fb8a3d..057b2fb8a3d 100644
--- a/jstests/core/mr_agg_explain.js
+++ b/jstests/core/query/mr/mr_agg_explain.js
diff --git a/jstests/core/mr_bigobject.js b/jstests/core/query/mr/mr_bigobject.js
index 7e125f13c20..7e125f13c20 100644
--- a/jstests/core/mr_bigobject.js
+++ b/jstests/core/query/mr/mr_bigobject.js
diff --git a/jstests/core/mr_bigobject_replace.js b/jstests/core/query/mr/mr_bigobject_replace.js
index fa491b422ba..fa491b422ba 100644
--- a/jstests/core/mr_bigobject_replace.js
+++ b/jstests/core/query/mr/mr_bigobject_replace.js
diff --git a/jstests/core/mr_comments.js b/jstests/core/query/mr/mr_comments.js
index bdc0e5a9ec0..bdc0e5a9ec0 100644
--- a/jstests/core/mr_comments.js
+++ b/jstests/core/query/mr/mr_comments.js
diff --git a/jstests/core/mr_compute_avg.js b/jstests/core/query/mr/mr_compute_avg.js
index b5934b310d7..b5934b310d7 100644
--- a/jstests/core/mr_compute_avg.js
+++ b/jstests/core/query/mr/mr_compute_avg.js
diff --git a/jstests/core/mr_correctness.js b/jstests/core/query/mr/mr_correctness.js
index 340c45b9b3b..340c45b9b3b 100644
--- a/jstests/core/mr_correctness.js
+++ b/jstests/core/query/mr/mr_correctness.js
diff --git a/jstests/core/mr_fail_invalid_js.js b/jstests/core/query/mr/mr_fail_invalid_js.js
index f08bac3728b..f08bac3728b 100644
--- a/jstests/core/mr_fail_invalid_js.js
+++ b/jstests/core/query/mr/mr_fail_invalid_js.js
diff --git a/jstests/core/mr_killop.js b/jstests/core/query/mr/mr_killop.js
index de91c72c7af..de91c72c7af 100644
--- a/jstests/core/mr_killop.js
+++ b/jstests/core/query/mr/mr_killop.js
diff --git a/jstests/core/mr_merge.js b/jstests/core/query/mr/mr_merge.js
index 63e7fd7032b..63e7fd7032b 100644
--- a/jstests/core/mr_merge.js
+++ b/jstests/core/query/mr/mr_merge.js
diff --git a/jstests/core/mr_multikey_deduping.js b/jstests/core/query/mr/mr_multikey_deduping.js
index 0ff1f345138..0ff1f345138 100644
--- a/jstests/core/mr_multikey_deduping.js
+++ b/jstests/core/query/mr/mr_multikey_deduping.js
diff --git a/jstests/core/mr_null_arguments.js b/jstests/core/query/mr/mr_null_arguments.js
index 47c1b55692e..47c1b55692e 100644
--- a/jstests/core/mr_null_arguments.js
+++ b/jstests/core/query/mr/mr_null_arguments.js
diff --git a/jstests/core/mr_preserve_indexes.js b/jstests/core/query/mr/mr_preserve_indexes.js
index ccaea694cd3..ccaea694cd3 100644
--- a/jstests/core/mr_preserve_indexes.js
+++ b/jstests/core/query/mr/mr_preserve_indexes.js
diff --git a/jstests/core/mr_reduce.js b/jstests/core/query/mr/mr_reduce.js
index 67a83c71ea1..67a83c71ea1 100644
--- a/jstests/core/mr_reduce.js
+++ b/jstests/core/query/mr/mr_reduce.js
diff --git a/jstests/core/mr_reduce_merge_other_db.js b/jstests/core/query/mr/mr_reduce_merge_other_db.js
index b6e0f0938d2..b6e0f0938d2 100644
--- a/jstests/core/mr_reduce_merge_other_db.js
+++ b/jstests/core/query/mr/mr_reduce_merge_other_db.js
diff --git a/jstests/core/mr_replace_into_other_db.js b/jstests/core/query/mr/mr_replace_into_other_db.js
index c31157d704d..c31157d704d 100644
--- a/jstests/core/mr_replace_into_other_db.js
+++ b/jstests/core/query/mr/mr_replace_into_other_db.js
diff --git a/jstests/core/mr_scope.js b/jstests/core/query/mr/mr_scope.js
index 76d99f4ec46..76d99f4ec46 100644
--- a/jstests/core/mr_scope.js
+++ b/jstests/core/query/mr/mr_scope.js
diff --git a/jstests/core/mr_sort.js b/jstests/core/query/mr/mr_sort.js
index 083635ff038..083635ff038 100644
--- a/jstests/core/mr_sort.js
+++ b/jstests/core/query/mr/mr_sort.js
diff --git a/jstests/core/mr_stored.js b/jstests/core/query/mr/mr_stored.js
index 01e821b008c..01e821b008c 100644
--- a/jstests/core/mr_stored.js
+++ b/jstests/core/query/mr/mr_stored.js
diff --git a/jstests/core/mr_tolerates_js_exception.js b/jstests/core/query/mr/mr_tolerates_js_exception.js
index daef9209bcc..daef9209bcc 100644
--- a/jstests/core/mr_tolerates_js_exception.js
+++ b/jstests/core/query/mr/mr_tolerates_js_exception.js
diff --git a/jstests/core/mr_use_this_object.js b/jstests/core/query/mr/mr_use_this_object.js
index 524cf643660..524cf643660 100644
--- a/jstests/core/mr_use_this_object.js
+++ b/jstests/core/query/mr/mr_use_this_object.js
diff --git a/jstests/core/nan.js b/jstests/core/query/nan.js
index a7ddf66eef1..a7ddf66eef1 100644
--- a/jstests/core/nan.js
+++ b/jstests/core/query/nan.js
diff --git a/jstests/core/ne1.js b/jstests/core/query/ne/ne1.js
index 5069637eb30..5069637eb30 100644
--- a/jstests/core/ne1.js
+++ b/jstests/core/query/ne/ne1.js
diff --git a/jstests/core/ne2.js b/jstests/core/query/ne/ne2.js
index 8f2b3d52f4c..8f2b3d52f4c 100644
--- a/jstests/core/ne2.js
+++ b/jstests/core/query/ne/ne2.js
diff --git a/jstests/core/ne3.js b/jstests/core/query/ne/ne3.js
index 5c38858c019..5c38858c019 100644
--- a/jstests/core/ne3.js
+++ b/jstests/core/query/ne/ne3.js
diff --git a/jstests/core/ne_array.js b/jstests/core/query/ne/ne_array.js
index 891bf0d2e91..891bf0d2e91 100644
--- a/jstests/core/ne_array.js
+++ b/jstests/core/query/ne/ne_array.js
diff --git a/jstests/core/neq_null_correctly_cache.js b/jstests/core/query/neq_null_correctly_cache.js
index 8b2089b3d4d..8b2089b3d4d 100644
--- a/jstests/core/neq_null_correctly_cache.js
+++ b/jstests/core/query/neq_null_correctly_cache.js
diff --git a/jstests/core/nestedarr1.js b/jstests/core/query/nestedarr1.js
index 248a70b5f78..248a70b5f78 100644
--- a/jstests/core/nestedarr1.js
+++ b/jstests/core/query/nestedarr1.js
diff --git a/jstests/core/nestedobj1.js b/jstests/core/query/nestedobj1.js
index ba97f326934..ba97f326934 100644
--- a/jstests/core/nestedobj1.js
+++ b/jstests/core/query/nestedobj1.js
diff --git a/jstests/core/nin.js b/jstests/core/query/nin/nin.js
index b9887e48828..b9887e48828 100644
--- a/jstests/core/nin.js
+++ b/jstests/core/query/nin/nin.js
diff --git a/jstests/core/nin2.js b/jstests/core/query/nin/nin2.js
index d134f5ad4a4..d134f5ad4a4 100644
--- a/jstests/core/nin2.js
+++ b/jstests/core/query/nin/nin2.js
diff --git a/jstests/core/nor.js b/jstests/core/query/nor.js
index 59f647aa7fd..59f647aa7fd 100644
--- a/jstests/core/nor.js
+++ b/jstests/core/query/nor.js
diff --git a/jstests/core/not1.js b/jstests/core/query/not/not1.js
index 0726895ebbd..0726895ebbd 100644
--- a/jstests/core/not1.js
+++ b/jstests/core/query/not/not1.js
diff --git a/jstests/core/not2.js b/jstests/core/query/not/not2.js
index 31b2efcfa02..31b2efcfa02 100644
--- a/jstests/core/not2.js
+++ b/jstests/core/query/not/not2.js
diff --git a/jstests/core/not3.js b/jstests/core/query/not/not3.js
index eac6bf8f047..eac6bf8f047 100644
--- a/jstests/core/not3.js
+++ b/jstests/core/query/not/not3.js
diff --git a/jstests/core/null_field_name.js b/jstests/core/query/null_field_name.js
index f90ce65cc87..f90ce65cc87 100644
--- a/jstests/core/null_field_name.js
+++ b/jstests/core/query/null_field_name.js
diff --git a/jstests/core/null_query_semantics.js b/jstests/core/query/null_query_semantics.js
index a99741853d2..a99741853d2 100644
--- a/jstests/core/null_query_semantics.js
+++ b/jstests/core/query/null_query_semantics.js
diff --git a/jstests/core/numberint.js b/jstests/core/query/number/numberint.js
index 55c923aea79..55c923aea79 100644
--- a/jstests/core/numberint.js
+++ b/jstests/core/query/number/numberint.js
diff --git a/jstests/core/numberlong.js b/jstests/core/query/number/numberlong.js
index a7dfd014539..a7dfd014539 100644
--- a/jstests/core/numberlong.js
+++ b/jstests/core/query/number/numberlong.js
diff --git a/jstests/core/numberlong2.js b/jstests/core/query/number/numberlong2.js
index be254027b79..be254027b79 100644
--- a/jstests/core/numberlong2.js
+++ b/jstests/core/query/number/numberlong2.js
diff --git a/jstests/core/numberlong3.js b/jstests/core/query/number/numberlong3.js
index 0dabdec2a05..0dabdec2a05 100644
--- a/jstests/core/numberlong3.js
+++ b/jstests/core/query/number/numberlong3.js
diff --git a/jstests/core/numberlong4.js b/jstests/core/query/number/numberlong4.js
index d7d73898b34..d7d73898b34 100644
--- a/jstests/core/numberlong4.js
+++ b/jstests/core/query/number/numberlong4.js
diff --git a/jstests/core/objectfind.js b/jstests/core/query/objectfind.js
index 452da414256..452da414256 100644
--- a/jstests/core/objectfind.js
+++ b/jstests/core/query/objectfind.js
diff --git a/jstests/core/objid1.js b/jstests/core/query/objid/objid1.js
index d08089c26db..d08089c26db 100644
--- a/jstests/core/objid1.js
+++ b/jstests/core/query/objid/objid1.js
diff --git a/jstests/core/objid2.js b/jstests/core/query/objid/objid2.js
index 247843b587b..247843b587b 100644
--- a/jstests/core/objid2.js
+++ b/jstests/core/query/objid/objid2.js
diff --git a/jstests/core/objid3.js b/jstests/core/query/objid/objid3.js
index 12d45530e52..12d45530e52 100644
--- a/jstests/core/objid3.js
+++ b/jstests/core/query/objid/objid3.js
diff --git a/jstests/core/objid4.js b/jstests/core/query/objid/objid4.js
index 7513e077029..7513e077029 100644
--- a/jstests/core/objid4.js
+++ b/jstests/core/query/objid/objid4.js
diff --git a/jstests/core/objid5.js b/jstests/core/query/objid/objid5.js
index a6c90aa7ffb..a6c90aa7ffb 100644
--- a/jstests/core/objid5.js
+++ b/jstests/core/query/objid/objid5.js
diff --git a/jstests/core/objid6.js b/jstests/core/query/objid/objid6.js
index 28be2a3fa42..28be2a3fa42 100644
--- a/jstests/core/objid6.js
+++ b/jstests/core/query/objid/objid6.js
diff --git a/jstests/core/objid7.js b/jstests/core/query/objid/objid7.js
index 4c3505f8965..4c3505f8965 100644
--- a/jstests/core/objid7.js
+++ b/jstests/core/query/objid/objid7.js
diff --git a/jstests/core/or1.js b/jstests/core/query/or/or1.js
index d90947d5f87..d90947d5f87 100644
--- a/jstests/core/or1.js
+++ b/jstests/core/query/or/or1.js
diff --git a/jstests/core/or2.js b/jstests/core/query/or/or2.js
index 03acfc32174..03acfc32174 100644
--- a/jstests/core/or2.js
+++ b/jstests/core/query/or/or2.js
diff --git a/jstests/core/or3.js b/jstests/core/query/or/or3.js
index 57b151d8f4b..57b151d8f4b 100644
--- a/jstests/core/or3.js
+++ b/jstests/core/query/or/or3.js
diff --git a/jstests/core/or4.js b/jstests/core/query/or/or4.js
index e2cd9086a51..e2cd9086a51 100644
--- a/jstests/core/or4.js
+++ b/jstests/core/query/or/or4.js
diff --git a/jstests/core/or5.js b/jstests/core/query/or/or5.js
index 1843c3d6cb7..1843c3d6cb7 100644
--- a/jstests/core/or5.js
+++ b/jstests/core/query/or/or5.js
diff --git a/jstests/core/or6.js b/jstests/core/query/or/or6.js
index 8865d62d4f3..8865d62d4f3 100644
--- a/jstests/core/or6.js
+++ b/jstests/core/query/or/or6.js
diff --git a/jstests/core/or7.js b/jstests/core/query/or/or7.js
index e639a195739..e639a195739 100644
--- a/jstests/core/or7.js
+++ b/jstests/core/query/or/or7.js
diff --git a/jstests/core/or8.js b/jstests/core/query/or/or8.js
index f33ef3146ce..f33ef3146ce 100644
--- a/jstests/core/or8.js
+++ b/jstests/core/query/or/or8.js
diff --git a/jstests/core/or9.js b/jstests/core/query/or/or9.js
index 4938e84ca04..4938e84ca04 100644
--- a/jstests/core/or9.js
+++ b/jstests/core/query/or/or9.js
diff --git a/jstests/core/or_inexact.js b/jstests/core/query/or/or_inexact.js
index 82f6c078d4e..82f6c078d4e 100644
--- a/jstests/core/or_inexact.js
+++ b/jstests/core/query/or/or_inexact.js
diff --git a/jstests/core/or_to_in.js b/jstests/core/query/or/or_to_in.js
index 5d3c745dc95..5d3c745dc95 100644
--- a/jstests/core/or_to_in.js
+++ b/jstests/core/query/or/or_to_in.js
diff --git a/jstests/core/ora.js b/jstests/core/query/or/ora.js
index ca07516cae3..ca07516cae3 100644
--- a/jstests/core/ora.js
+++ b/jstests/core/query/or/ora.js
diff --git a/jstests/core/orb.js b/jstests/core/query/or/orb.js
index aa75bb97e0b..aa75bb97e0b 100644
--- a/jstests/core/orb.js
+++ b/jstests/core/query/or/orb.js
diff --git a/jstests/core/orc.js b/jstests/core/query/or/orc.js
index 001d6f4bc9f..001d6f4bc9f 100644
--- a/jstests/core/orc.js
+++ b/jstests/core/query/or/orc.js
diff --git a/jstests/core/ord.js b/jstests/core/query/or/ord.js
index af289cc1000..af289cc1000 100644
--- a/jstests/core/ord.js
+++ b/jstests/core/query/or/ord.js
diff --git a/jstests/core/ore.js b/jstests/core/query/or/ore.js
index 756db6215c5..756db6215c5 100644
--- a/jstests/core/ore.js
+++ b/jstests/core/query/or/ore.js
diff --git a/jstests/core/orf.js b/jstests/core/query/or/orf.js
index 64cbb3b9ba5..64cbb3b9ba5 100644
--- a/jstests/core/orf.js
+++ b/jstests/core/query/or/orf.js
diff --git a/jstests/core/org.js b/jstests/core/query/or/org.js
index 0c6808330c8..0c6808330c8 100644
--- a/jstests/core/org.js
+++ b/jstests/core/query/or/org.js
diff --git a/jstests/core/orh.js b/jstests/core/query/or/orh.js
index 91ce121e5a4..91ce121e5a4 100644
--- a/jstests/core/orh.js
+++ b/jstests/core/query/or/orh.js
diff --git a/jstests/core/orj.js b/jstests/core/query/or/orj.js
index 6aabb3c39c7..6aabb3c39c7 100644
--- a/jstests/core/orj.js
+++ b/jstests/core/query/or/orj.js
diff --git a/jstests/core/ork.js b/jstests/core/query/or/ork.js
index 8ce2346b6f3..8ce2346b6f3 100644
--- a/jstests/core/ork.js
+++ b/jstests/core/query/or/ork.js
diff --git a/jstests/core/oro.js b/jstests/core/query/or/oro.js
index 5ceda73818e..5ceda73818e 100644
--- a/jstests/core/oro.js
+++ b/jstests/core/query/or/oro.js
diff --git a/jstests/core/orp.js b/jstests/core/query/or/orp.js
index 738e2330f69..738e2330f69 100644
--- a/jstests/core/orp.js
+++ b/jstests/core/query/or/orp.js
diff --git a/jstests/core/cached_plan_trial_does_not_discard_work.js b/jstests/core/query/plan_cache/cached_plan_trial_does_not_discard_work.js
index f83b9e6a817..f83b9e6a817 100644
--- a/jstests/core/cached_plan_trial_does_not_discard_work.js
+++ b/jstests/core/query/plan_cache/cached_plan_trial_does_not_discard_work.js
diff --git a/jstests/core/collation_plan_cache.js b/jstests/core/query/plan_cache/collation_plan_cache.js
index da6c2f08081..da6c2f08081 100644
--- a/jstests/core/collation_plan_cache.js
+++ b/jstests/core/query/plan_cache/collation_plan_cache.js
diff --git a/jstests/core/plan_cache_clear.js b/jstests/core/query/plan_cache/plan_cache_clear.js
index 7aee144bc89..7aee144bc89 100644
--- a/jstests/core/plan_cache_clear.js
+++ b/jstests/core/query/plan_cache/plan_cache_clear.js
diff --git a/jstests/core/plan_cache_list_plans.js b/jstests/core/query/plan_cache/plan_cache_list_plans.js
index 6521aac3448..6521aac3448 100644
--- a/jstests/core/plan_cache_list_plans.js
+++ b/jstests/core/query/plan_cache/plan_cache_list_plans.js
diff --git a/jstests/core/plan_cache_list_shapes.js b/jstests/core/query/plan_cache/plan_cache_list_shapes.js
index 7d348cc21a2..7d348cc21a2 100644
--- a/jstests/core/plan_cache_list_shapes.js
+++ b/jstests/core/query/plan_cache/plan_cache_list_shapes.js
diff --git a/jstests/core/plan_cache_positional_projection.js b/jstests/core/query/plan_cache/plan_cache_positional_projection.js
index 7b35f71f99e..7b35f71f99e 100644
--- a/jstests/core/plan_cache_positional_projection.js
+++ b/jstests/core/query/plan_cache/plan_cache_positional_projection.js
diff --git a/jstests/core/plan_cache_sbe.js b/jstests/core/query/plan_cache/plan_cache_sbe.js
index aeb0609246c..aeb0609246c 100644
--- a/jstests/core/plan_cache_sbe.js
+++ b/jstests/core/query/plan_cache/plan_cache_sbe.js
diff --git a/jstests/core/plan_cache_shell_helpers.js b/jstests/core/query/plan_cache/plan_cache_shell_helpers.js
index b663e09e90b..b663e09e90b 100644
--- a/jstests/core/plan_cache_shell_helpers.js
+++ b/jstests/core/query/plan_cache/plan_cache_shell_helpers.js
diff --git a/jstests/core/plan_cache_stats_shard_and_host.js b/jstests/core/query/plan_cache/plan_cache_stats_shard_and_host.js
index 69a2214e6b9..69a2214e6b9 100644
--- a/jstests/core/plan_cache_stats_shard_and_host.js
+++ b/jstests/core/query/plan_cache/plan_cache_stats_shard_and_host.js
diff --git a/jstests/core/proj_key1.js b/jstests/core/query/project/proj_key1.js
index c4834ffad49..c4834ffad49 100644
--- a/jstests/core/proj_key1.js
+++ b/jstests/core/query/project/proj_key1.js
diff --git a/jstests/core/project_with_collation.js b/jstests/core/query/project/project_with_collation.js
index 3f16716532f..3f16716532f 100644
--- a/jstests/core/project_with_collation.js
+++ b/jstests/core/query/project/project_with_collation.js
diff --git a/jstests/core/projection_conflicts.js b/jstests/core/query/project/projection_conflicts.js
index a77dcd9f843..a77dcd9f843 100644
--- a/jstests/core/projection_conflicts.js
+++ b/jstests/core/query/project/projection_conflicts.js
diff --git a/jstests/core/projection_dotted_paths.js b/jstests/core/query/project/projection_dotted_paths.js
index 7f6eb1bfef2..7f6eb1bfef2 100644
--- a/jstests/core/projection_dotted_paths.js
+++ b/jstests/core/query/project/projection_dotted_paths.js
diff --git a/jstests/core/projection_expr_mod.js b/jstests/core/query/project/projection_expr_mod.js
index aa882d190b5..aa882d190b5 100644
--- a/jstests/core/projection_expr_mod.js
+++ b/jstests/core/query/project/projection_expr_mod.js
diff --git a/jstests/core/projection_meta_index_key.js b/jstests/core/query/project/projection_meta_index_key.js
index 01f6d3c7876..01f6d3c7876 100644
--- a/jstests/core/projection_meta_index_key.js
+++ b/jstests/core/query/project/projection_meta_index_key.js
diff --git a/jstests/core/projection_semantics.js b/jstests/core/query/project/projection_semantics.js
index cf71f951755..cf71f951755 100644
--- a/jstests/core/projection_semantics.js
+++ b/jstests/core/query/project/projection_semantics.js
diff --git a/jstests/core/pull.js b/jstests/core/query/pull/pull.js
index 612c65f9e65..612c65f9e65 100644
--- a/jstests/core/pull.js
+++ b/jstests/core/query/pull/pull.js
diff --git a/jstests/core/pull2.js b/jstests/core/query/pull/pull2.js
index a1b79955bb0..a1b79955bb0 100644
--- a/jstests/core/pull2.js
+++ b/jstests/core/query/pull/pull2.js
diff --git a/jstests/core/pull_or.js b/jstests/core/query/pull/pull_or.js
index 9ef1e091d29..9ef1e091d29 100644
--- a/jstests/core/pull_or.js
+++ b/jstests/core/query/pull/pull_or.js
diff --git a/jstests/core/pull_remove1.js b/jstests/core/query/pull/pull_remove1.js
index ab9368bab3b..ab9368bab3b 100644
--- a/jstests/core/pull_remove1.js
+++ b/jstests/core/query/pull/pull_remove1.js
diff --git a/jstests/core/pullall.js b/jstests/core/query/pull/pullall.js
index 2cd0872b079..2cd0872b079 100644
--- a/jstests/core/pullall.js
+++ b/jstests/core/query/pull/pullall.js
diff --git a/jstests/core/pullall2.js b/jstests/core/query/pull/pullall2.js
index 10e8c89caa1..10e8c89caa1 100644
--- a/jstests/core/pullall2.js
+++ b/jstests/core/query/pull/pullall2.js
diff --git a/jstests/core/push.js b/jstests/core/query/push/push.js
index 6722aa9b3c8..6722aa9b3c8 100644
--- a/jstests/core/push.js
+++ b/jstests/core/query/push/push.js
diff --git a/jstests/core/push2.js b/jstests/core/query/push/push2.js
index 10669aa2581..10669aa2581 100644
--- a/jstests/core/push2.js
+++ b/jstests/core/query/push/push2.js
diff --git a/jstests/core/push_sort.js b/jstests/core/query/push/push_sort.js
index 2d74a3909f8..2d74a3909f8 100644
--- a/jstests/core/push_sort.js
+++ b/jstests/core/query/push/push_sort.js
diff --git a/jstests/core/query1.js b/jstests/core/query/query1.js
index 7e16a03a8fc..7e16a03a8fc 100644
--- a/jstests/core/query1.js
+++ b/jstests/core/query/query1.js
diff --git a/jstests/core/query_hash_stability.js b/jstests/core/query/query_hash_stability.js
index aa0a3399e70..aa0a3399e70 100644
--- a/jstests/core/query_hash_stability.js
+++ b/jstests/core/query/query_hash_stability.js
diff --git a/jstests/core/queryoptimizera.js b/jstests/core/query/queryoptimizera.js
index 2f3f2266847..2f3f2266847 100644
--- a/jstests/core/queryoptimizera.js
+++ b/jstests/core/query/queryoptimizera.js
diff --git a/jstests/core/regex.js b/jstests/core/query/regex/regex.js
index 363a03db20c..363a03db20c 100644
--- a/jstests/core/regex.js
+++ b/jstests/core/query/regex/regex.js
diff --git a/jstests/core/regex2.js b/jstests/core/query/regex/regex2.js
index 6ed1f2d290c..6ed1f2d290c 100644
--- a/jstests/core/regex2.js
+++ b/jstests/core/query/regex/regex2.js
diff --git a/jstests/core/regex3.js b/jstests/core/query/regex/regex3.js
index b21a7a81435..b21a7a81435 100644
--- a/jstests/core/regex3.js
+++ b/jstests/core/query/regex/regex3.js
diff --git a/jstests/core/regex4.js b/jstests/core/query/regex/regex4.js
index 0f7963fdd1e..0f7963fdd1e 100644
--- a/jstests/core/regex4.js
+++ b/jstests/core/query/regex/regex4.js
diff --git a/jstests/core/regex5.js b/jstests/core/query/regex/regex5.js
index d0836a62686..d0836a62686 100644
--- a/jstests/core/regex5.js
+++ b/jstests/core/query/regex/regex5.js
diff --git a/jstests/core/regex6.js b/jstests/core/query/regex/regex6.js
index cc7b507f610..cc7b507f610 100644
--- a/jstests/core/regex6.js
+++ b/jstests/core/query/regex/regex6.js
diff --git a/jstests/core/regex7.js b/jstests/core/query/regex/regex7.js
index c9c5454dbc5..c9c5454dbc5 100644
--- a/jstests/core/regex7.js
+++ b/jstests/core/query/regex/regex7.js
diff --git a/jstests/core/regex8.js b/jstests/core/query/regex/regex8.js
index 20164acf464..20164acf464 100644
--- a/jstests/core/regex8.js
+++ b/jstests/core/query/regex/regex8.js
diff --git a/jstests/core/regex9.js b/jstests/core/query/regex/regex9.js
index 96188d689dc..96188d689dc 100644
--- a/jstests/core/regex9.js
+++ b/jstests/core/query/regex/regex9.js
diff --git a/jstests/core/regex_distinct.js b/jstests/core/query/regex/regex_distinct.js
index 7852950853c..7852950853c 100644
--- a/jstests/core/regex_distinct.js
+++ b/jstests/core/query/regex/regex_distinct.js
diff --git a/jstests/core/regex_embed1.js b/jstests/core/query/regex/regex_embed1.js
index 11d92a6f3dc..11d92a6f3dc 100644
--- a/jstests/core/regex_embed1.js
+++ b/jstests/core/query/regex/regex_embed1.js
diff --git a/jstests/core/regex_error.js b/jstests/core/query/regex/regex_error.js
index 072b006b241..072b006b241 100644
--- a/jstests/core/regex_error.js
+++ b/jstests/core/query/regex/regex_error.js
diff --git a/jstests/core/regex_limit.js b/jstests/core/query/regex/regex_limit.js
index 052c87c4f3f..052c87c4f3f 100644
--- a/jstests/core/regex_limit.js
+++ b/jstests/core/query/regex/regex_limit.js
diff --git a/jstests/core/regex_not_id.js b/jstests/core/query/regex/regex_not_id.js
index a38b452d423..a38b452d423 100644
--- a/jstests/core/regex_not_id.js
+++ b/jstests/core/query/regex/regex_not_id.js
diff --git a/jstests/core/regex_options.js b/jstests/core/query/regex/regex_options.js
index 120a3a9c9a5..120a3a9c9a5 100644
--- a/jstests/core/regex_options.js
+++ b/jstests/core/query/regex/regex_options.js
diff --git a/jstests/core/regex_unicode.js b/jstests/core/query/regex/regex_unicode.js
index 2befd6f700c..2befd6f700c 100644
--- a/jstests/core/regex_unicode.js
+++ b/jstests/core/query/regex/regex_unicode.js
diff --git a/jstests/core/regex_util.js b/jstests/core/query/regex/regex_util.js
index 7d87ac5f283..7d87ac5f283 100644
--- a/jstests/core/regex_util.js
+++ b/jstests/core/query/regex/regex_util.js
diff --git a/jstests/core/regex_verbs.js b/jstests/core/query/regex/regex_verbs.js
index 52ac9bb07bf..52ac9bb07bf 100644
--- a/jstests/core/regex_verbs.js
+++ b/jstests/core/query/regex/regex_verbs.js
diff --git a/jstests/core/regexa.js b/jstests/core/query/regex/regexa.js
index 694436e87a8..694436e87a8 100644
--- a/jstests/core/regexa.js
+++ b/jstests/core/query/regex/regexa.js
diff --git a/jstests/core/regexb.js b/jstests/core/query/regex/regexb.js
index 09e3518728b..09e3518728b 100644
--- a/jstests/core/regexb.js
+++ b/jstests/core/query/regex/regexb.js
diff --git a/jstests/core/regexc.js b/jstests/core/query/regex/regexc.js
index 235d509a3c2..235d509a3c2 100644
--- a/jstests/core/regexc.js
+++ b/jstests/core/query/regex/regexc.js
diff --git a/jstests/core/rename_operator.js b/jstests/core/query/rename/rename_operator.js
index e86cc077e65..e86cc077e65 100644
--- a/jstests/core/rename_operator.js
+++ b/jstests/core/query/rename/rename_operator.js
diff --git a/jstests/core/rename_operator_change_target_type.js b/jstests/core/query/rename/rename_operator_change_target_type.js
index a98f46ab1db..a98f46ab1db 100644
--- a/jstests/core/rename_operator_change_target_type.js
+++ b/jstests/core/query/rename/rename_operator_change_target_type.js
diff --git a/jstests/core/rename_operator_missing_source.js b/jstests/core/query/rename/rename_operator_missing_source.js
index ff219cda563..ff219cda563 100644
--- a/jstests/core/rename_operator_missing_source.js
+++ b/jstests/core/query/rename/rename_operator_missing_source.js
diff --git a/jstests/core/set1.js b/jstests/core/query/set/set1.js
index bae41fc5803..bae41fc5803 100644
--- a/jstests/core/set1.js
+++ b/jstests/core/query/set/set1.js
diff --git a/jstests/core/set2.js b/jstests/core/query/set/set2.js
index c5b6e1c9553..c5b6e1c9553 100644
--- a/jstests/core/set2.js
+++ b/jstests/core/query/set/set2.js
diff --git a/jstests/core/set3.js b/jstests/core/query/set/set3.js
index 4af579fa0b9..4af579fa0b9 100644
--- a/jstests/core/set3.js
+++ b/jstests/core/query/set/set3.js
diff --git a/jstests/core/set4.js b/jstests/core/query/set/set4.js
index 99c0913b977..99c0913b977 100644
--- a/jstests/core/set4.js
+++ b/jstests/core/query/set/set4.js
diff --git a/jstests/core/set5.js b/jstests/core/query/set/set5.js
index a848899f4af..a848899f4af 100644
--- a/jstests/core/set5.js
+++ b/jstests/core/query/set/set5.js
diff --git a/jstests/core/set6.js b/jstests/core/query/set/set6.js
index 2f82eb40a68..2f82eb40a68 100644
--- a/jstests/core/set6.js
+++ b/jstests/core/query/set/set6.js
diff --git a/jstests/core/set7.js b/jstests/core/query/set/set7.js
index e1cdd0f3bf2..e1cdd0f3bf2 100644
--- a/jstests/core/set7.js
+++ b/jstests/core/query/set/set7.js
diff --git a/jstests/core/set_type_change.js b/jstests/core/query/set/set_type_change.js
index be6fc709041..be6fc709041 100644
--- a/jstests/core/set_type_change.js
+++ b/jstests/core/query/set/set_type_change.js
diff --git a/jstests/core/sort1.js b/jstests/core/query/sort/sort1.js
index ec713e189e5..ec713e189e5 100644
--- a/jstests/core/sort1.js
+++ b/jstests/core/query/sort/sort1.js
diff --git a/jstests/core/sort10.js b/jstests/core/query/sort/sort10.js
index 6819c76fa5b..6819c76fa5b 100644
--- a/jstests/core/sort10.js
+++ b/jstests/core/query/sort/sort10.js
diff --git a/jstests/core/sort2.js b/jstests/core/query/sort/sort2.js
index 1d373193fcc..1d373193fcc 100644
--- a/jstests/core/sort2.js
+++ b/jstests/core/query/sort/sort2.js
diff --git a/jstests/core/sort3.js b/jstests/core/query/sort/sort3.js
index 211c3d1e1c2..211c3d1e1c2 100644
--- a/jstests/core/sort3.js
+++ b/jstests/core/query/sort/sort3.js
diff --git a/jstests/core/sort4.js b/jstests/core/query/sort/sort4.js
index e74df1f4bd6..e74df1f4bd6 100644
--- a/jstests/core/sort4.js
+++ b/jstests/core/query/sort/sort4.js
diff --git a/jstests/core/sort5.js b/jstests/core/query/sort/sort5.js
index 01a267bf6b6..01a267bf6b6 100644
--- a/jstests/core/sort5.js
+++ b/jstests/core/query/sort/sort5.js
diff --git a/jstests/core/sort6.js b/jstests/core/query/sort/sort6.js
index f2658bbcbad..f2658bbcbad 100644
--- a/jstests/core/sort6.js
+++ b/jstests/core/query/sort/sort6.js
diff --git a/jstests/core/sort8.js b/jstests/core/query/sort/sort8.js
index fa0b0040de1..fa0b0040de1 100644
--- a/jstests/core/sort8.js
+++ b/jstests/core/query/sort/sort8.js
diff --git a/jstests/core/sort9.js b/jstests/core/query/sort/sort9.js
index 57496b40da1..57496b40da1 100644
--- a/jstests/core/sort9.js
+++ b/jstests/core/query/sort/sort9.js
diff --git a/jstests/core/sort_array.js b/jstests/core/query/sort/sort_array.js
index fccfe744a71..fccfe744a71 100644
--- a/jstests/core/sort_array.js
+++ b/jstests/core/query/sort/sort_array.js
diff --git a/jstests/core/sort_dotted_paths.js b/jstests/core/query/sort/sort_dotted_paths.js
index 1ce7ad2533e..1ce7ad2533e 100644
--- a/jstests/core/sort_dotted_paths.js
+++ b/jstests/core/query/sort/sort_dotted_paths.js
diff --git a/jstests/core/sort_dotted_paths_collation.js b/jstests/core/query/sort/sort_dotted_paths_collation.js
index 10111a95441..10111a95441 100644
--- a/jstests/core/sort_dotted_paths_collation.js
+++ b/jstests/core/query/sort/sort_dotted_paths_collation.js
diff --git a/jstests/core/sort_merge.js b/jstests/core/query/sort/sort_merge.js
index fe6e24917d7..fe6e24917d7 100644
--- a/jstests/core/sort_merge.js
+++ b/jstests/core/query/sort/sort_merge.js
diff --git a/jstests/core/sort_merge_collation.js b/jstests/core/query/sort/sort_merge_collation.js
index 38e6f33d9da..38e6f33d9da 100644
--- a/jstests/core/sort_merge_collation.js
+++ b/jstests/core/query/sort/sort_merge_collation.js
diff --git a/jstests/core/sort_numeric.js b/jstests/core/query/sort/sort_numeric.js
index 5ff3e71a066..5ff3e71a066 100644
--- a/jstests/core/sort_numeric.js
+++ b/jstests/core/query/sort/sort_numeric.js
diff --git a/jstests/core/sort_with_meta_operator.js b/jstests/core/query/sort/sort_with_meta_operator.js
index 333de73a975..333de73a975 100644
--- a/jstests/core/sort_with_meta_operator.js
+++ b/jstests/core/query/sort/sort_with_meta_operator.js
diff --git a/jstests/core/sort_with_update_between_getmores.js b/jstests/core/query/sort/sort_with_update_between_getmores.js
index ec3cd4bf465..ec3cd4bf465 100644
--- a/jstests/core/sort_with_update_between_getmores.js
+++ b/jstests/core/query/sort/sort_with_update_between_getmores.js
diff --git a/jstests/core/sorta.js b/jstests/core/query/sort/sorta.js
index 8f29121f4b0..8f29121f4b0 100644
--- a/jstests/core/sorta.js
+++ b/jstests/core/query/sort/sorta.js
diff --git a/jstests/core/sortb.js b/jstests/core/query/sort/sortb.js
index 7c6abe340b4..7c6abe340b4 100644
--- a/jstests/core/sortb.js
+++ b/jstests/core/query/sort/sortb.js
diff --git a/jstests/core/sortc.js b/jstests/core/query/sort/sortc.js
index 975b3acf764..975b3acf764 100644
--- a/jstests/core/sortc.js
+++ b/jstests/core/query/sort/sortc.js
diff --git a/jstests/core/sortd.js b/jstests/core/query/sort/sortd.js
index 525f08ea947..525f08ea947 100644
--- a/jstests/core/sortd.js
+++ b/jstests/core/query/sort/sortd.js
diff --git a/jstests/core/sortf.js b/jstests/core/query/sort/sortf.js
index 47c6a27ed9f..47c6a27ed9f 100644
--- a/jstests/core/sortf.js
+++ b/jstests/core/query/sort/sortf.js
diff --git a/jstests/core/sortg.js b/jstests/core/query/sort/sortg.js
index 7e6186af097..7e6186af097 100644
--- a/jstests/core/sortg.js
+++ b/jstests/core/query/sort/sortg.js
diff --git a/jstests/core/sorth.js b/jstests/core/query/sort/sorth.js
index 81568dfeb29..81568dfeb29 100644
--- a/jstests/core/sorth.js
+++ b/jstests/core/query/sort/sorth.js
diff --git a/jstests/core/sorti.js b/jstests/core/query/sort/sorti.js
index e30739b4867..e30739b4867 100644
--- a/jstests/core/sorti.js
+++ b/jstests/core/query/sort/sorti.js
diff --git a/jstests/core/sortj.js b/jstests/core/query/sort/sortj.js
index 43773b5ede6..43773b5ede6 100644
--- a/jstests/core/sortj.js
+++ b/jstests/core/query/sort/sortj.js
diff --git a/jstests/core/sortk.js b/jstests/core/query/sort/sortk.js
index 8815974cb10..8815974cb10 100644
--- a/jstests/core/sortk.js
+++ b/jstests/core/query/sort/sortk.js
diff --git a/jstests/core/sortl.js b/jstests/core/query/sort/sortl.js
index 23c2673b135..23c2673b135 100644
--- a/jstests/core/sortl.js
+++ b/jstests/core/query/sort/sortl.js
diff --git a/jstests/core/type1.js b/jstests/core/query/type/type1.js
index 8066de2a5c4..8066de2a5c4 100644
--- a/jstests/core/type1.js
+++ b/jstests/core/query/type/type1.js
diff --git a/jstests/core/type2.js b/jstests/core/query/type/type2.js
index d93d313d60f..d93d313d60f 100644
--- a/jstests/core/type2.js
+++ b/jstests/core/query/type/type2.js
diff --git a/jstests/core/type3.js b/jstests/core/query/type/type3.js
index 8b4858662dd..8b4858662dd 100644
--- a/jstests/core/type3.js
+++ b/jstests/core/query/type/type3.js
diff --git a/jstests/core/type4.js b/jstests/core/query/type/type4.js
index c7e11110618..c7e11110618 100644
--- a/jstests/core/type4.js
+++ b/jstests/core/query/type/type4.js
diff --git a/jstests/core/type5.js b/jstests/core/query/type/type5.js
index b0f84f4885b..b0f84f4885b 100644
--- a/jstests/core/type5.js
+++ b/jstests/core/query/type/type5.js
diff --git a/jstests/core/type6.js b/jstests/core/query/type/type6.js
index 869592a7980..869592a7980 100644
--- a/jstests/core/type6.js
+++ b/jstests/core/query/type/type6.js
diff --git a/jstests/core/type7.js b/jstests/core/query/type/type7.js
index a9e0d67c3b0..a9e0d67c3b0 100644
--- a/jstests/core/type7.js
+++ b/jstests/core/query/type/type7.js
diff --git a/jstests/core/type8.js b/jstests/core/query/type/type8.js
index d7fb6fe5e57..d7fb6fe5e57 100644
--- a/jstests/core/type8.js
+++ b/jstests/core/query/type/type8.js
diff --git a/jstests/core/type_array.js b/jstests/core/query/type/type_array.js
index 136bb5aa2f3..136bb5aa2f3 100644
--- a/jstests/core/type_array.js
+++ b/jstests/core/query/type/type_array.js
diff --git a/jstests/core/type_operator_on_missing_values.js b/jstests/core/query/type/type_operator_on_missing_values.js
index 9a67b23b882..9a67b23b882 100644
--- a/jstests/core/type_operator_on_missing_values.js
+++ b/jstests/core/query/type/type_operator_on_missing_values.js
diff --git a/jstests/core/unset.js b/jstests/core/query/unset/unset.js
index 14e18229723..14e18229723 100644
--- a/jstests/core/unset.js
+++ b/jstests/core/query/unset/unset.js
diff --git a/jstests/core/unset2.js b/jstests/core/query/unset/unset2.js
index e120ae2b674..e120ae2b674 100644
--- a/jstests/core/unset2.js
+++ b/jstests/core/query/unset/unset2.js
diff --git a/jstests/core/where1.js b/jstests/core/query/where/where1.js
index 1082bb902e8..1082bb902e8 100644
--- a/jstests/core/where1.js
+++ b/jstests/core/query/where/where1.js
diff --git a/jstests/core/where2.js b/jstests/core/query/where/where2.js
index 6561c829353..6561c829353 100644
--- a/jstests/core/where2.js
+++ b/jstests/core/query/where/where2.js
diff --git a/jstests/core/where3.js b/jstests/core/query/where/where3.js
index ffbe690312c..ffbe690312c 100644
--- a/jstests/core/where3.js
+++ b/jstests/core/query/where/where3.js
diff --git a/jstests/core/where5.js b/jstests/core/query/where/where5.js
index 9f8b974d0aa..9f8b974d0aa 100644
--- a/jstests/core/where5.js
+++ b/jstests/core/query/where/where5.js
diff --git a/jstests/core/where_multiple_plans.js b/jstests/core/query/where/where_multiple_plans.js
index 86f2e050747..86f2e050747 100644
--- a/jstests/core/where_multiple_plans.js
+++ b/jstests/core/query/where/where_multiple_plans.js
diff --git a/jstests/core/where_system_js.js b/jstests/core/query/where/where_system_js.js
index 8672106e5f4..8672106e5f4 100644
--- a/jstests/core/where_system_js.js
+++ b/jstests/core/query/where/where_system_js.js
diff --git a/jstests/core/where_tolerates_js_exception.js b/jstests/core/query/where/where_tolerates_js_exception.js
index ed11b3e64a5..ed11b3e64a5 100644
--- a/jstests/core/where_tolerates_js_exception.js
+++ b/jstests/core/query/where/where_tolerates_js_exception.js
diff --git a/jstests/core/autocomplete.js b/jstests/core/shell/autocomplete.js
index 6b8fb6ffa78..6b8fb6ffa78 100644
--- a/jstests/core/autocomplete.js
+++ b/jstests/core/shell/autocomplete.js
diff --git a/jstests/core/binData.js b/jstests/core/shell/binData.js
index 521815bec95..521815bec95 100644
--- a/jstests/core/binData.js
+++ b/jstests/core/shell/binData.js
diff --git a/jstests/core/bson.js b/jstests/core/shell/bson.js
index 7139c6d3e1e..7139c6d3e1e 100644
--- a/jstests/core/bson.js
+++ b/jstests/core/shell/bson.js
diff --git a/jstests/core/bson_compare_bug.js b/jstests/core/shell/bson_compare_bug.js
index 798af7a6992..798af7a6992 100644
--- a/jstests/core/bson_compare_bug.js
+++ b/jstests/core/shell/bson_compare_bug.js
diff --git a/jstests/core/collection_save.js b/jstests/core/shell/collection_save.js
index d375aa9f31e..d375aa9f31e 100644
--- a/jstests/core/collection_save.js
+++ b/jstests/core/shell/collection_save.js
diff --git a/jstests/core/shell1.js b/jstests/core/shell/shell1.js
index 4fc4c3a1c15..4fc4c3a1c15 100644
--- a/jstests/core/shell1.js
+++ b/jstests/core/shell/shell1.js
diff --git a/jstests/core/shell_connection_strings.js b/jstests/core/shell/shell_connection_strings.js
index 92207fcc941..92207fcc941 100644
--- a/jstests/core/shell_connection_strings.js
+++ b/jstests/core/shell/shell_connection_strings.js
diff --git a/jstests/core/shell_writeconcern.js b/jstests/core/shell/shell_writeconcern.js
index fb30601fbcd..fb30601fbcd 100644
--- a/jstests/core/shell_writeconcern.js
+++ b/jstests/core/shell/shell_writeconcern.js
diff --git a/jstests/core/shellkillop.js b/jstests/core/shell/shellkillop.js
index 0ac2ad681ed..0ac2ad681ed 100644
--- a/jstests/core/shellkillop.js
+++ b/jstests/core/shell/shellkillop.js
diff --git a/jstests/core/shellstartparallel.js b/jstests/core/shell/shellstartparallel.js
index e86d4690401..e86d4690401 100644
--- a/jstests/core/shellstartparallel.js
+++ b/jstests/core/shell/shellstartparallel.js
diff --git a/jstests/core/shelltypes.js b/jstests/core/shell/shelltypes.js
index 42a9d231897..42a9d231897 100644
--- a/jstests/core/shelltypes.js
+++ b/jstests/core/shell/shelltypes.js
diff --git a/jstests/core/user_management_helpers.js b/jstests/core/shell/user_management_helpers.js
index 0e68c51d1f3..0e68c51d1f3 100644
--- a/jstests/core/user_management_helpers.js
+++ b/jstests/core/shell/user_management_helpers.js
diff --git a/jstests/core/stages_and_hash.js b/jstests/core/stage_debug/stages_and_hash.js
index 4e75dace007..4e75dace007 100644
--- a/jstests/core/stages_and_hash.js
+++ b/jstests/core/stage_debug/stages_and_hash.js
diff --git a/jstests/core/stages_and_sorted.js b/jstests/core/stage_debug/stages_and_sorted.js
index 34826baaa32..34826baaa32 100644
--- a/jstests/core/stages_and_sorted.js
+++ b/jstests/core/stage_debug/stages_and_sorted.js
diff --git a/jstests/core/stages_collection_scan.js b/jstests/core/stage_debug/stages_collection_scan.js
index 08b3eb2eeb6..08b3eb2eeb6 100644
--- a/jstests/core/stages_collection_scan.js
+++ b/jstests/core/stage_debug/stages_collection_scan.js
diff --git a/jstests/core/stages_delete.js b/jstests/core/stage_debug/stages_delete.js
index 0136650f27d..0136650f27d 100644
--- a/jstests/core/stages_delete.js
+++ b/jstests/core/stage_debug/stages_delete.js
diff --git a/jstests/core/stages_fetch.js b/jstests/core/stage_debug/stages_fetch.js
index bdec393ce1c..bdec393ce1c 100644
--- a/jstests/core/stages_fetch.js
+++ b/jstests/core/stage_debug/stages_fetch.js
diff --git a/jstests/core/stages_ixscan.js b/jstests/core/stage_debug/stages_ixscan.js
index de345fabb02..de345fabb02 100644
--- a/jstests/core/stages_ixscan.js
+++ b/jstests/core/stage_debug/stages_ixscan.js
diff --git a/jstests/core/stages_limit_skip.js b/jstests/core/stage_debug/stages_limit_skip.js
index 623e403c504..623e403c504 100644
--- a/jstests/core/stages_limit_skip.js
+++ b/jstests/core/stage_debug/stages_limit_skip.js
diff --git a/jstests/core/stages_mergesort.js b/jstests/core/stage_debug/stages_mergesort.js
index c202a3ca827..c202a3ca827 100644
--- a/jstests/core/stages_mergesort.js
+++ b/jstests/core/stage_debug/stages_mergesort.js
diff --git a/jstests/core/stages_or.js b/jstests/core/stage_debug/stages_or.js
index 6eb2e9812fb..6eb2e9812fb 100644
--- a/jstests/core/stages_or.js
+++ b/jstests/core/stage_debug/stages_or.js
diff --git a/jstests/core/stages_sort.js b/jstests/core/stage_debug/stages_sort.js
index 2fd682edc3c..2fd682edc3c 100644
--- a/jstests/core/stages_sort.js
+++ b/jstests/core/stage_debug/stages_sort.js
diff --git a/jstests/core/autoid.js b/jstests/core/write/autoid.js
index 679b109fcc5..679b109fcc5 100644
--- a/jstests/core/autoid.js
+++ b/jstests/core/write/autoid.js
diff --git a/jstests/core/batch_write_collation_estsize.js b/jstests/core/write/batch_write_collation_estsize.js
index bfaf1e54bd3..bfaf1e54bd3 100644
--- a/jstests/core/batch_write_collation_estsize.js
+++ b/jstests/core/write/batch_write_collation_estsize.js
diff --git a/jstests/core/batch_write_command_w0.js b/jstests/core/write/batch_write_command_w0.js
index 7d5038120b6..7d5038120b6 100644
--- a/jstests/core/batch_write_command_w0.js
+++ b/jstests/core/write/batch_write_command_w0.js
diff --git a/jstests/core/batched_multi_deletes.js b/jstests/core/write/batched_multi_deletes.js
index 70287f2d6eb..70287f2d6eb 100644
--- a/jstests/core/batched_multi_deletes.js
+++ b/jstests/core/write/batched_multi_deletes.js
diff --git a/jstests/core/bulk_api_ordered.js b/jstests/core/write/bulk/bulk_api_ordered.js
index fa4063ef6f9..fa4063ef6f9 100644
--- a/jstests/core/bulk_api_ordered.js
+++ b/jstests/core/write/bulk/bulk_api_ordered.js
diff --git a/jstests/core/bulk_api_unordered.js b/jstests/core/write/bulk/bulk_api_unordered.js
index 613ac1e609d..613ac1e609d 100644
--- a/jstests/core/bulk_api_unordered.js
+++ b/jstests/core/write/bulk/bulk_api_unordered.js
diff --git a/jstests/core/bulk_insert.js b/jstests/core/write/bulk/bulk_insert.js
index 91e81d62c11..91e81d62c11 100644
--- a/jstests/core/bulk_insert.js
+++ b/jstests/core/write/bulk/bulk_insert.js
diff --git a/jstests/core/bulk_insert_capped.js b/jstests/core/write/bulk/bulk_insert_capped.js
index f1db06f5a93..f1db06f5a93 100644
--- a/jstests/core/bulk_insert_capped.js
+++ b/jstests/core/write/bulk/bulk_insert_capped.js
diff --git a/jstests/core/bulk_write.js b/jstests/core/write/bulk/bulk_write.js
index f75273da969..f75273da969 100644
--- a/jstests/core/bulk_write.js
+++ b/jstests/core/write/bulk/bulk_write.js
diff --git a/jstests/core/collation_find_and_modify.js b/jstests/core/write/collation_find_and_modify.js
index 0285c706dcf..0285c706dcf 100644
--- a/jstests/core/collation_find_and_modify.js
+++ b/jstests/core/write/collation_find_and_modify.js
diff --git a/jstests/core/collection_truncate.js b/jstests/core/write/collection_truncate.js
index c5a44c52325..c5a44c52325 100644
--- a/jstests/core/collection_truncate.js
+++ b/jstests/core/write/collection_truncate.js
diff --git a/jstests/core/collection_uuid_write_commands.js b/jstests/core/write/collection_uuid_write_commands.js
index ff9781ec090..ff9781ec090 100644
--- a/jstests/core/collection_uuid_write_commands.js
+++ b/jstests/core/write/collection_uuid_write_commands.js
diff --git a/jstests/core/crud_api.js b/jstests/core/write/crud_api.js
index de8d72e50af..de8d72e50af 100644
--- a/jstests/core/crud_api.js
+++ b/jstests/core/write/crud_api.js
diff --git a/jstests/core/crud_ops_do_not_throw_locktimeout.js b/jstests/core/write/crud_ops_do_not_throw_locktimeout.js
index 8062ca996d1..8062ca996d1 100644
--- a/jstests/core/crud_ops_do_not_throw_locktimeout.js
+++ b/jstests/core/write/crud_ops_do_not_throw_locktimeout.js
diff --git a/jstests/core/batch_write_command_delete.js b/jstests/core/write/delete/batch_write_command_delete.js
index ecd3ea39f05..ecd3ea39f05 100644
--- a/jstests/core/batch_write_command_delete.js
+++ b/jstests/core/write/delete/batch_write_command_delete.js
diff --git a/jstests/core/delete_hint.js b/jstests/core/write/delete/delete_hint.js
index 6b944702fd9..6b944702fd9 100644
--- a/jstests/core/delete_hint.js
+++ b/jstests/core/write/delete/delete_hint.js
diff --git a/jstests/core/remove.js b/jstests/core/write/delete/remove.js
index f08792aeca5..f08792aeca5 100644
--- a/jstests/core/remove.js
+++ b/jstests/core/write/delete/remove.js
diff --git a/jstests/core/remove2.js b/jstests/core/write/delete/remove2.js
index 4193b8dd11f..4193b8dd11f 100644
--- a/jstests/core/remove2.js
+++ b/jstests/core/write/delete/remove2.js
diff --git a/jstests/core/remove3.js b/jstests/core/write/delete/remove3.js
index 6f0a94589e9..6f0a94589e9 100644
--- a/jstests/core/remove3.js
+++ b/jstests/core/write/delete/remove3.js
diff --git a/jstests/core/remove4.js b/jstests/core/write/delete/remove4.js
index 483de24bf7d..483de24bf7d 100644
--- a/jstests/core/remove4.js
+++ b/jstests/core/write/delete/remove4.js
diff --git a/jstests/core/remove6.js b/jstests/core/write/delete/remove6.js
index f60200a8d81..f60200a8d81 100644
--- a/jstests/core/remove6.js
+++ b/jstests/core/write/delete/remove6.js
diff --git a/jstests/core/remove7.js b/jstests/core/write/delete/remove7.js
index 9cc86329990..9cc86329990 100644
--- a/jstests/core/remove7.js
+++ b/jstests/core/write/delete/remove7.js
diff --git a/jstests/core/remove8.js b/jstests/core/write/delete/remove8.js
index 7a8263c21e4..7a8263c21e4 100644
--- a/jstests/core/remove8.js
+++ b/jstests/core/write/delete/remove8.js
diff --git a/jstests/core/remove_justone.js b/jstests/core/write/delete/remove_justone.js
index f5345627e34..f5345627e34 100644
--- a/jstests/core/remove_justone.js
+++ b/jstests/core/write/delete/remove_justone.js
diff --git a/jstests/core/remove_undefined.js b/jstests/core/write/delete/remove_undefined.js
index 11463c107c5..11463c107c5 100644
--- a/jstests/core/remove_undefined.js
+++ b/jstests/core/write/delete/remove_undefined.js
diff --git a/jstests/core/removea.js b/jstests/core/write/delete/removea.js
index 9fd489b7005..9fd489b7005 100644
--- a/jstests/core/removea.js
+++ b/jstests/core/write/delete/removea.js
diff --git a/jstests/core/removeb.js b/jstests/core/write/delete/removeb.js
index d4ea12aa8f6..d4ea12aa8f6 100644
--- a/jstests/core/removeb.js
+++ b/jstests/core/write/delete/removeb.js
diff --git a/jstests/core/removec.js b/jstests/core/write/delete/removec.js
index 560f7405de3..560f7405de3 100644
--- a/jstests/core/removec.js
+++ b/jstests/core/write/delete/removec.js
diff --git a/jstests/core/find_and_modify.js b/jstests/core/write/find_and_modify/find_and_modify.js
index 56eae294568..56eae294568 100644
--- a/jstests/core/find_and_modify.js
+++ b/jstests/core/write/find_and_modify/find_and_modify.js
diff --git a/jstests/core/find_and_modify2.js b/jstests/core/write/find_and_modify/find_and_modify2.js
index d34fe5f4281..d34fe5f4281 100644
--- a/jstests/core/find_and_modify2.js
+++ b/jstests/core/write/find_and_modify/find_and_modify2.js
diff --git a/jstests/core/find_and_modify3.js b/jstests/core/write/find_and_modify/find_and_modify3.js
index a319aef7a2d..a319aef7a2d 100644
--- a/jstests/core/find_and_modify3.js
+++ b/jstests/core/write/find_and_modify/find_and_modify3.js
diff --git a/jstests/core/find_and_modify4.js b/jstests/core/write/find_and_modify/find_and_modify4.js
index d5b3ae23cb2..d5b3ae23cb2 100644
--- a/jstests/core/find_and_modify4.js
+++ b/jstests/core/write/find_and_modify/find_and_modify4.js
diff --git a/jstests/core/find_and_modify_concurrent_update.js b/jstests/core/write/find_and_modify/find_and_modify_concurrent_update.js
index dca7c547c18..dca7c547c18 100644
--- a/jstests/core/find_and_modify_concurrent_update.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_concurrent_update.js
diff --git a/jstests/core/find_and_modify_empty_coll.js b/jstests/core/write/find_and_modify/find_and_modify_empty_coll.js
index c47674c800a..c47674c800a 100644
--- a/jstests/core/find_and_modify_empty_coll.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_empty_coll.js
diff --git a/jstests/core/find_and_modify_empty_update.js b/jstests/core/write/find_and_modify/find_and_modify_empty_update.js
index d35b53539f4..d35b53539f4 100644
--- a/jstests/core/find_and_modify_empty_update.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_empty_update.js
diff --git a/jstests/core/find_and_modify_hint.js b/jstests/core/write/find_and_modify/find_and_modify_hint.js
index 9298e92dd74..9298e92dd74 100644
--- a/jstests/core/find_and_modify_hint.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_hint.js
diff --git a/jstests/core/find_and_modify_invalid_query_params.js b/jstests/core/write/find_and_modify/find_and_modify_invalid_query_params.js
index 1a84a126284..1a84a126284 100644
--- a/jstests/core/find_and_modify_invalid_query_params.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_invalid_query_params.js
diff --git a/jstests/core/find_and_modify_metrics.js b/jstests/core/write/find_and_modify/find_and_modify_metrics.js
index 37ba521ef73..37ba521ef73 100644
--- a/jstests/core/find_and_modify_metrics.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_metrics.js
diff --git a/jstests/core/find_and_modify_pipeline_update.js b/jstests/core/write/find_and_modify/find_and_modify_pipeline_update.js
index 0340d29bd66..0340d29bd66 100644
--- a/jstests/core/find_and_modify_pipeline_update.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_pipeline_update.js
diff --git a/jstests/core/find_and_modify_server6226.js b/jstests/core/write/find_and_modify/find_and_modify_server6226.js
index e99b910e178..e99b910e178 100644
--- a/jstests/core/find_and_modify_server6226.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server6226.js
diff --git a/jstests/core/find_and_modify_server6254.js b/jstests/core/write/find_and_modify/find_and_modify_server6254.js
index 5a0dae9db22..5a0dae9db22 100644
--- a/jstests/core/find_and_modify_server6254.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server6254.js
diff --git a/jstests/core/find_and_modify_server6582.js b/jstests/core/write/find_and_modify/find_and_modify_server6582.js
index 7ad8aebee76..7ad8aebee76 100644
--- a/jstests/core/find_and_modify_server6582.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server6582.js
diff --git a/jstests/core/find_and_modify_server6588.js b/jstests/core/write/find_and_modify/find_and_modify_server6588.js
index 197c892ca67..197c892ca67 100644
--- a/jstests/core/find_and_modify_server6588.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server6588.js
diff --git a/jstests/core/find_and_modify_server6659.js b/jstests/core/write/find_and_modify/find_and_modify_server6659.js
index 029a32d6a49..029a32d6a49 100644
--- a/jstests/core/find_and_modify_server6659.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server6659.js
diff --git a/jstests/core/find_and_modify_server6865.js b/jstests/core/write/find_and_modify/find_and_modify_server6865.js
index 7aba57e0030..7aba57e0030 100644
--- a/jstests/core/find_and_modify_server6865.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server6865.js
diff --git a/jstests/core/find_and_modify_server6909.js b/jstests/core/write/find_and_modify/find_and_modify_server6909.js
index c74e342822b..c74e342822b 100644
--- a/jstests/core/find_and_modify_server6909.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server6909.js
diff --git a/jstests/core/find_and_modify_server6993.js b/jstests/core/write/find_and_modify/find_and_modify_server6993.js
index 4d9b169700d..4d9b169700d 100644
--- a/jstests/core/find_and_modify_server6993.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server6993.js
diff --git a/jstests/core/find_and_modify_server7660.js b/jstests/core/write/find_and_modify/find_and_modify_server7660.js
index 7973279ddcf..7973279ddcf 100644
--- a/jstests/core/find_and_modify_server7660.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_server7660.js
diff --git a/jstests/core/find_and_modify_where.js b/jstests/core/write/find_and_modify/find_and_modify_where.js
index 62375da7aab..62375da7aab 100644
--- a/jstests/core/find_and_modify_where.js
+++ b/jstests/core/write/find_and_modify/find_and_modify_where.js
diff --git a/jstests/core/batch_write_command_insert.js b/jstests/core/write/insert/batch_write_command_insert.js
index 1a60806c939..1a60806c939 100644
--- a/jstests/core/batch_write_command_insert.js
+++ b/jstests/core/write/insert/batch_write_command_insert.js
diff --git a/jstests/core/insert1.js b/jstests/core/write/insert/insert1.js
index 6fa207e0bfc..6fa207e0bfc 100644
--- a/jstests/core/insert1.js
+++ b/jstests/core/write/insert/insert1.js
diff --git a/jstests/core/insert_id_undefined.js b/jstests/core/write/insert/insert_id_undefined.js
index 6d0bc38f8fb..6d0bc38f8fb 100644
--- a/jstests/core/insert_id_undefined.js
+++ b/jstests/core/write/insert/insert_id_undefined.js
diff --git a/jstests/core/insert_illegal_doc.js b/jstests/core/write/insert/insert_illegal_doc.js
index f6344f1c62b..f6344f1c62b 100644
--- a/jstests/core/insert_illegal_doc.js
+++ b/jstests/core/write/insert/insert_illegal_doc.js
diff --git a/jstests/core/insert_one.js b/jstests/core/write/insert/insert_one.js
index 4c0a5d2af6f..4c0a5d2af6f 100644
--- a/jstests/core/insert_one.js
+++ b/jstests/core/write/insert/insert_one.js
diff --git a/jstests/core/batch_write_command_update.js b/jstests/core/write/update/batch_write_command_update.js
index d9e0fea6668..d9e0fea6668 100644
--- a/jstests/core/batch_write_command_update.js
+++ b/jstests/core/write/update/batch_write_command_update.js
diff --git a/jstests/core/collation_update.js b/jstests/core/write/update/collation_update.js
index 72f51de48d1..72f51de48d1 100644
--- a/jstests/core/collation_update.js
+++ b/jstests/core/write/update/collation_update.js
diff --git a/jstests/core/update2.js b/jstests/core/write/update/update2.js
index 080875b50bd..080875b50bd 100644
--- a/jstests/core/update2.js
+++ b/jstests/core/write/update/update2.js
diff --git a/jstests/core/update3.js b/jstests/core/write/update/update3.js
index 5a61b8bcfc9..5a61b8bcfc9 100644
--- a/jstests/core/update3.js
+++ b/jstests/core/write/update/update3.js
diff --git a/jstests/core/update5.js b/jstests/core/write/update/update5.js
index fafc0d72ce0..fafc0d72ce0 100644
--- a/jstests/core/update5.js
+++ b/jstests/core/write/update/update5.js
diff --git a/jstests/core/update6.js b/jstests/core/write/update/update6.js
index 8a1950b8d02..8a1950b8d02 100644
--- a/jstests/core/update6.js
+++ b/jstests/core/write/update/update6.js
diff --git a/jstests/core/update7.js b/jstests/core/write/update/update7.js
index d3a7a5d1deb..d3a7a5d1deb 100644
--- a/jstests/core/update7.js
+++ b/jstests/core/write/update/update7.js
diff --git a/jstests/core/update8.js b/jstests/core/write/update/update8.js
index 596bc8695dd..596bc8695dd 100644
--- a/jstests/core/update8.js
+++ b/jstests/core/write/update/update8.js
diff --git a/jstests/core/update9.js b/jstests/core/write/update/update9.js
index d119681a09e..d119681a09e 100644
--- a/jstests/core/update9.js
+++ b/jstests/core/write/update/update9.js
diff --git a/jstests/core/update_addToSet.js b/jstests/core/write/update/update_addToSet.js
index 0713170d228..0713170d228 100644
--- a/jstests/core/update_addToSet.js
+++ b/jstests/core/write/update/update_addToSet.js
diff --git a/jstests/core/update_addToSet2.js b/jstests/core/write/update/update_addToSet2.js
index 44ba8bce671..44ba8bce671 100644
--- a/jstests/core/update_addToSet2.js
+++ b/jstests/core/write/update/update_addToSet2.js
diff --git a/jstests/core/update_addToSet3.js b/jstests/core/write/update/update_addToSet3.js
index efd682cef4c..efd682cef4c 100644
--- a/jstests/core/update_addToSet3.js
+++ b/jstests/core/write/update/update_addToSet3.js
diff --git a/jstests/core/update_affects_indexes.js b/jstests/core/write/update/update_affects_indexes.js
index 41b0cb4a016..41b0cb4a016 100644
--- a/jstests/core/update_affects_indexes.js
+++ b/jstests/core/write/update/update_affects_indexes.js
diff --git a/jstests/core/update_arrayFilters.js b/jstests/core/write/update/update_arrayFilters.js
index 9618fed1c5c..9618fed1c5c 100644
--- a/jstests/core/update_arrayFilters.js
+++ b/jstests/core/write/update/update_arrayFilters.js
diff --git a/jstests/core/update_array_offset_positional.js b/jstests/core/write/update/update_array_offset_positional.js
index 210e4d65bb7..210e4d65bb7 100644
--- a/jstests/core/update_array_offset_positional.js
+++ b/jstests/core/write/update/update_array_offset_positional.js
diff --git a/jstests/core/update_arraymatch1.js b/jstests/core/write/update/update_arraymatch1.js
index 10b7e37e451..10b7e37e451 100644
--- a/jstests/core/update_arraymatch1.js
+++ b/jstests/core/write/update/update_arraymatch1.js
diff --git a/jstests/core/update_arraymatch2.js b/jstests/core/write/update/update_arraymatch2.js
index 7610de7c962..7610de7c962 100644
--- a/jstests/core/update_arraymatch2.js
+++ b/jstests/core/write/update/update_arraymatch2.js
diff --git a/jstests/core/update_arraymatch3.js b/jstests/core/write/update/update_arraymatch3.js
index 36f7ab22430..36f7ab22430 100644
--- a/jstests/core/update_arraymatch3.js
+++ b/jstests/core/write/update/update_arraymatch3.js
diff --git a/jstests/core/update_arraymatch4.js b/jstests/core/write/update/update_arraymatch4.js
index 3c087e53ca5..3c087e53ca5 100644
--- a/jstests/core/update_arraymatch4.js
+++ b/jstests/core/write/update/update_arraymatch4.js
diff --git a/jstests/core/update_arraymatch5.js b/jstests/core/write/update/update_arraymatch5.js
index 1b4c967b38b..1b4c967b38b 100644
--- a/jstests/core/update_arraymatch5.js
+++ b/jstests/core/write/update/update_arraymatch5.js
diff --git a/jstests/core/update_arraymatch6.js b/jstests/core/write/update/update_arraymatch6.js
index 1241753b866..1241753b866 100644
--- a/jstests/core/update_arraymatch6.js
+++ b/jstests/core/write/update/update_arraymatch6.js
diff --git a/jstests/core/update_arraymatch7.js b/jstests/core/write/update/update_arraymatch7.js
index cded4ba56f4..cded4ba56f4 100644
--- a/jstests/core/update_arraymatch7.js
+++ b/jstests/core/write/update/update_arraymatch7.js
diff --git a/jstests/core/update_arraymatch8.js b/jstests/core/write/update/update_arraymatch8.js
index e3aa91d6422..e3aa91d6422 100644
--- a/jstests/core/update_arraymatch8.js
+++ b/jstests/core/write/update/update_arraymatch8.js
diff --git a/jstests/core/update_bit_examples.js b/jstests/core/write/update/update_bit_examples.js
index fd94a1b417d..fd94a1b417d 100644
--- a/jstests/core/update_bit_examples.js
+++ b/jstests/core/write/update/update_bit_examples.js
diff --git a/jstests/core/update_blank1.js b/jstests/core/write/update/update_blank1.js
index cd8f7433ebe..cd8f7433ebe 100644
--- a/jstests/core/update_blank1.js
+++ b/jstests/core/write/update/update_blank1.js
diff --git a/jstests/core/update_currentdate_examples.js b/jstests/core/write/update/update_currentdate_examples.js
index e8a3da2ea09..e8a3da2ea09 100644
--- a/jstests/core/update_currentdate_examples.js
+++ b/jstests/core/write/update/update_currentdate_examples.js
diff --git a/jstests/core/update_dbref.js b/jstests/core/write/update/update_dbref.js
index f3e461c7379..f3e461c7379 100644
--- a/jstests/core/update_dbref.js
+++ b/jstests/core/write/update/update_dbref.js
diff --git a/jstests/core/update_find_and_modify_id.js b/jstests/core/write/update/update_find_and_modify_id.js
index f6fd646d087..f6fd646d087 100644
--- a/jstests/core/update_find_and_modify_id.js
+++ b/jstests/core/write/update/update_find_and_modify_id.js
diff --git a/jstests/core/update_hint.js b/jstests/core/write/update/update_hint.js
index f0869073de0..f0869073de0 100644
--- a/jstests/core/update_hint.js
+++ b/jstests/core/write/update/update_hint.js
diff --git a/jstests/core/update_invalid1.js b/jstests/core/write/update/update_invalid1.js
index bbda4cee53e..bbda4cee53e 100644
--- a/jstests/core/update_invalid1.js
+++ b/jstests/core/write/update/update_invalid1.js
diff --git a/jstests/core/update_metrics.js b/jstests/core/write/update/update_metrics.js
index 8bf93e5009d..8bf93e5009d 100644
--- a/jstests/core/update_metrics.js
+++ b/jstests/core/write/update/update_metrics.js
diff --git a/jstests/core/update_min_max_examples.js b/jstests/core/write/update/update_min_max_examples.js
index bc5a7302e79..bc5a7302e79 100644
--- a/jstests/core/update_min_max_examples.js
+++ b/jstests/core/write/update/update_min_max_examples.js
diff --git a/jstests/core/update_modifier_pop.js b/jstests/core/write/update/update_modifier_pop.js
index e5a61c8ea8f..e5a61c8ea8f 100644
--- a/jstests/core/update_modifier_pop.js
+++ b/jstests/core/write/update/update_modifier_pop.js
diff --git a/jstests/core/update_mul_examples.js b/jstests/core/write/update/update_mul_examples.js
index 89a0ac70532..89a0ac70532 100644
--- a/jstests/core/update_mul_examples.js
+++ b/jstests/core/write/update/update_mul_examples.js
diff --git a/jstests/core/update_multi3.js b/jstests/core/write/update/update_multi3.js
index 4c6769bc65a..4c6769bc65a 100644
--- a/jstests/core/update_multi3.js
+++ b/jstests/core/write/update/update_multi3.js
diff --git a/jstests/core/update_multi4.js b/jstests/core/write/update/update_multi4.js
index cfe11616efc..cfe11616efc 100644
--- a/jstests/core/update_multi4.js
+++ b/jstests/core/write/update/update_multi4.js
diff --git a/jstests/core/update_multi5.js b/jstests/core/write/update/update_multi5.js
index 683b4426874..683b4426874 100644
--- a/jstests/core/update_multi5.js
+++ b/jstests/core/write/update/update_multi5.js
diff --git a/jstests/core/update_multi6.js b/jstests/core/write/update/update_multi6.js
index 023398534cd..023398534cd 100644
--- a/jstests/core/update_multi6.js
+++ b/jstests/core/write/update/update_multi6.js
diff --git a/jstests/core/update_numeric_field_name.js b/jstests/core/write/update/update_numeric_field_name.js
index fbc89da7fda..fbc89da7fda 100644
--- a/jstests/core/update_numeric_field_name.js
+++ b/jstests/core/write/update/update_numeric_field_name.js
diff --git a/jstests/core/update_pipeline_shell_helpers.js b/jstests/core/write/update/update_pipeline_shell_helpers.js
index 0ac1b35f4ce..0ac1b35f4ce 100644
--- a/jstests/core/update_pipeline_shell_helpers.js
+++ b/jstests/core/write/update/update_pipeline_shell_helpers.js
diff --git a/jstests/core/update_server-12848.js b/jstests/core/write/update/update_server-12848.js
index 9f14feb09cd..9f14feb09cd 100644
--- a/jstests/core/update_server-12848.js
+++ b/jstests/core/write/update/update_server-12848.js
diff --git a/jstests/core/update_setOnInsert.js b/jstests/core/write/update/update_setOnInsert.js
index 9457c69f325..9457c69f325 100644
--- a/jstests/core/update_setOnInsert.js
+++ b/jstests/core/write/update/update_setOnInsert.js
diff --git a/jstests/core/update_with_large_hint.js b/jstests/core/write/update/update_with_large_hint.js
index 0b2521337ce..0b2521337ce 100644
--- a/jstests/core/update_with_large_hint.js
+++ b/jstests/core/write/update/update_with_large_hint.js
diff --git a/jstests/core/update_with_pipeline.js b/jstests/core/write/update/update_with_pipeline.js
index b5366bfbc5a..b5366bfbc5a 100644
--- a/jstests/core/update_with_pipeline.js
+++ b/jstests/core/write/update/update_with_pipeline.js
diff --git a/jstests/core/updatea.js b/jstests/core/write/update/updatea.js
index 99938c433fa..99938c433fa 100644
--- a/jstests/core/updatea.js
+++ b/jstests/core/write/update/updatea.js
diff --git a/jstests/core/updateb.js b/jstests/core/write/update/updateb.js
index 1518e7f3546..1518e7f3546 100644
--- a/jstests/core/updateb.js
+++ b/jstests/core/write/update/updateb.js
diff --git a/jstests/core/updatec.js b/jstests/core/write/update/updatec.js
index 8ce8cf4ecdd..8ce8cf4ecdd 100644
--- a/jstests/core/updatec.js
+++ b/jstests/core/write/update/updatec.js
diff --git a/jstests/core/updated.js b/jstests/core/write/update/updated.js
index 919d02610c7..919d02610c7 100644
--- a/jstests/core/updated.js
+++ b/jstests/core/write/update/updated.js
diff --git a/jstests/core/updatee.js b/jstests/core/write/update/updatee.js
index fbbcac01c9a..fbbcac01c9a 100644
--- a/jstests/core/updatee.js
+++ b/jstests/core/write/update/updatee.js
diff --git a/jstests/core/updatef.js b/jstests/core/write/update/updatef.js
index 6597484f78a..6597484f78a 100644
--- a/jstests/core/updatef.js
+++ b/jstests/core/write/update/updatef.js
diff --git a/jstests/core/updateg.js b/jstests/core/write/update/updateg.js
index 8a849a0ce59..8a849a0ce59 100644
--- a/jstests/core/updateg.js
+++ b/jstests/core/write/update/updateg.js
diff --git a/jstests/core/updateh.js b/jstests/core/write/update/updateh.js
index 72d0d22c616..72d0d22c616 100644
--- a/jstests/core/updateh.js
+++ b/jstests/core/write/update/updateh.js
diff --git a/jstests/core/updatei.js b/jstests/core/write/update/updatei.js
index 599c9538a80..599c9538a80 100644
--- a/jstests/core/updatei.js
+++ b/jstests/core/write/update/updatei.js
diff --git a/jstests/core/updatej.js b/jstests/core/write/update/updatej.js
index bab2a32f45f..bab2a32f45f 100644
--- a/jstests/core/updatej.js
+++ b/jstests/core/write/update/updatej.js
diff --git a/jstests/core/updatek.js b/jstests/core/write/update/updatek.js
index 923b4145d1d..923b4145d1d 100644
--- a/jstests/core/updatek.js
+++ b/jstests/core/write/update/updatek.js
diff --git a/jstests/core/updatel.js b/jstests/core/write/update/updatel.js
index a663f306722..a663f306722 100644
--- a/jstests/core/updatel.js
+++ b/jstests/core/write/update/updatel.js
diff --git a/jstests/core/updatem.js b/jstests/core/write/update/updatem.js
index 8e4af7e56c7..8e4af7e56c7 100644
--- a/jstests/core/updatem.js
+++ b/jstests/core/write/update/updatem.js
diff --git a/jstests/core/upsert_and.js b/jstests/core/write/update/upsert_and.js
index 1e45cbe8dc2..1e45cbe8dc2 100644
--- a/jstests/core/upsert_and.js
+++ b/jstests/core/write/update/upsert_and.js
diff --git a/jstests/core/upsert_fields.js b/jstests/core/write/update/upsert_fields.js
index 310bace4907..310bace4907 100644
--- a/jstests/core/upsert_fields.js
+++ b/jstests/core/write/update/upsert_fields.js
diff --git a/jstests/core/upsert_shell.js b/jstests/core/write/update/upsert_shell.js
index 3ab07b50c21..3ab07b50c21 100644
--- a/jstests/core/upsert_shell.js
+++ b/jstests/core/write/update/upsert_shell.js
diff --git a/jstests/core/validate_user_documents.js b/jstests/core/write/validate_user_documents.js
index 2a30ed0fea8..2a30ed0fea8 100644
--- a/jstests/core/validate_user_documents.js
+++ b/jstests/core/write/validate_user_documents.js
diff --git a/jstests/core/verify_update_mods.js b/jstests/core/write/verify_update_mods.js
index 4161c0f5b86..4161c0f5b86 100644
--- a/jstests/core/verify_update_mods.js
+++ b/jstests/core/write/verify_update_mods.js
diff --git a/jstests/core/write_change_stream_pit_preimage.js b/jstests/core/write/write_change_stream_pit_preimage.js
index a1cfd730fe4..a1cfd730fe4 100644
--- a/jstests/core/write_change_stream_pit_preimage.js
+++ b/jstests/core/write/write_change_stream_pit_preimage.js
diff --git a/jstests/core/write_commands_reject_unknown_fields.js b/jstests/core/write/write_commands_reject_unknown_fields.js
index a7f834280d1..a7f834280d1 100644
--- a/jstests/core/write_commands_reject_unknown_fields.js
+++ b/jstests/core/write/write_commands_reject_unknown_fields.js
diff --git a/jstests/core/write_error_message_truncation.js b/jstests/core/write/write_error_message_truncation.js
index 3a7a33ec86f..3a7a33ec86f 100644
--- a/jstests/core/write_error_message_truncation.js
+++ b/jstests/core/write/write_error_message_truncation.js
diff --git a/jstests/core/write_result.js b/jstests/core/write/write_result.js
index 4adba32839c..4adba32839c 100644
--- a/jstests/core/write_result.js
+++ b/jstests/core/write/write_result.js
diff --git a/jstests/libs/parallelTester.js b/jstests/libs/parallelTester.js
index 70eed46cd7b..de49441c19b 100644
--- a/jstests/libs/parallelTester.js
+++ b/jstests/libs/parallelTester.js
@@ -147,7 +147,7 @@ if (typeof _threadInject != "undefined") {
 
         // some tests can't run in parallel with most others
         var skipTests = makeKeys([
-            "indexb.js",
+            "index/indexb.js",
 
             // Tests that set a parameter that causes the server to ignore
             // long index keys.
@@ -159,7 +159,7 @@ if (typeof _threadInject != "undefined") {
             "notablescan.js",
             "notablescan_capped.js",
 
-            "mr_fail_invalid_js.js",
+            "query/mr/mr_fail_invalid_js.js",
             "run_program1.js",
             "bench_test1.js",
 
@@ -168,32 +168,32 @@ if (typeof _threadInject != "undefined") {
             // logs so much that the line they are looking for has been rotated off the server's
             // in-memory buffer of log messages, which only stores the 1024 most recent operations.
             "comment_field.js",
-            "getlog2.js",
+            "administrative/getlog2.js",
             "logprocessdetails.js",
-            "queryoptimizera.js",
+            "query/queryoptimizera.js",
             "log_remote_op_wait.js",
 
             "connections_opened.js",  // counts connections, globally
             "opcounters_write_cmd.js",
-            "set_param1.js",          // changes global state
-            "geo_update_btree2.js",   // SERVER-11132 test disables table scans
-            "update_setOnInsert.js",  // SERVER-9982
-            "max_time_ms.js",         // Sensitive to query execution time, by design
-            "autocomplete.js",        // Likewise.
+            "administrative/set_param1.js",        // changes global state
+            "index/geo/geo_update_btree2.js",      // SERVER-11132 test disables table scans
+            "write/update/update_setOnInsert.js",  // SERVER-9982
+            "max_time_ms.js",                      // Sensitive to query execution time, by design
+            "shell/autocomplete.js",               // Likewise.
 
             // This overwrites MinKey/MaxKey's singleton which breaks
             // any other test that uses MinKey/MaxKey
-            "type6.js",
+            "query/type/type6.js",
 
             // Assumes that other tests are not creating cursors.
             "kill_cursors.js",
 
             // Assumes that other tests are not starting operations.
-            "currentop_shell.js",
+            "administrative/current_op/currentop_shell.js",
 
             // These tests check global command counters.
-            "find_and_modify_metrics.js",
-            "update_metrics.js",
+            "write/find_and_modify/find_and_modify_metrics.js",
+            "write/update/update_metrics.js",
 
             // Views tests
             "views/invalid_system_views.js",      // Puts invalid view definitions in system.views.
@@ -202,7 +202,7 @@ if (typeof _threadInject != "undefined") {
 
             // This test causes collMod commands to hang, which interferes with other tests running
             // collMod.
-            "crud_ops_do_not_throw_locktimeout.js",
+            "write/crud_ops_do_not_throw_locktimeout.js",
 
             // Can fail if isMaster takes too long on a loaded machine.
             "dbadmin.js",
@@ -219,7 +219,7 @@ if (typeof _threadInject != "undefined") {
             "timeseries/timeseries_idle_buckets.js",
 
             // Assumes that other tests are not creating API version 1 incompatible data.
-            "validate_db_metadata_command.js",
+            "administrative/validate_db_metadata_command.js",
 
             // The tests in 'bench_test*.js' files use 'benchRun()'. The main purpose of
             // 'benchRun()' is for performance testing and the 'benchRun()' implementation itself
@@ -237,17 +237,17 @@ if (typeof _threadInject != "undefined") {
 
             // These tests rely on no writes happening that would force oplog truncation.
             "write_change_stream_pit_preimage_in_transaction.js",
-            "write_change_stream_pit_preimage.js",
+            "write/write_change_stream_pit_preimage.js",
 
             // These tests convert a non-unique index to a unique one, which is not compatible
             // when running against inMemory storage engine variants. Since this test only fails
             // in the parallel tester, which does not respect test tags, we omit the tests
             // instead of manually checking TestData values in the mongo shell for the Evergreen
             // variant.
-            "collmod_convert_index_uniqueness.js",
-            "collmod_convert_to_unique_apply_ops.js",
-            "collmod_convert_to_unique_violations.js",
-            "collmod_convert_to_unique_violations_size_limit.js",
+            "ddl/collmod_convert_index_uniqueness.js",
+            "ddl/collmod_convert_to_unique_apply_ops.js",
+            "ddl/collmod_convert_to_unique_violations.js",
+            "ddl/collmod_convert_to_unique_violations_size_limit.js",
 
             // The parallel tester does not respect test tags, compact cannot run against the
             // inMemory storage engine.
@@ -258,17 +258,17 @@ if (typeof _threadInject != "undefined") {
             "timeseries/timeseries_index_ttl_partial.js",
 
             // TODO SERVER-72447: Avoid this.
-            "column_scan_skip_row_store_projection.js",
-            "column_store_index_compression.js",
-            "columnstore_eligibility.js",
-            "columnstore_index.js",
-            "columnstore_index_correctness.js",
-            "columnstore_index_per_path_filters.js",
-            "columnstore_large_array_index_correctness.js",
-            "columnstore_validindex.js",
-            "hidden_index.js",
-            "null_query_semantics.js",
-            "projection_semantics.js",
+            "columnstore/column_scan_skip_row_store_projection.js",
+            "columnstore/column_store_index_compression.js",
+            "columnstore/columnstore_eligibility.js",
+            "columnstore/columnstore_index.js",
+            "columnstore/columnstore_index_correctness.js",
+            "columnstore/columnstore_index_per_path_filters.js",
+            "columnstore/columnstore_large_array_index_correctness.js",
+            "columnstore/columnstore_validindex.js",
+            "index/hidden_index.js",
+            "query/null_query_semantics.js",
+            "query/project/projection_semantics.js",
         ]);
 
         // Get files, including files in subdirectories.
@@ -299,8 +299,8 @@ if (typeof _threadInject != "undefined") {
         var serialTestsArr = [
             // These tests use fsyncLock.
             parallelFilesDir + "/fsync.js",
-            parallelFilesDir + "/currentop.js",
-            parallelFilesDir + "/killop_drop_collection.js",
+            parallelFilesDir + "/administrative/current_op/currentop.js",
+            parallelFilesDir + "/ddl/killop_drop_collection.js",
 
             // These tests expect the profiler to be on or off at specific points. They should not
             // be run in parallel with tests that perform fsyncLock. User operations skip writing to
@@ -309,36 +309,36 @@ if (typeof _threadInject != "undefined") {
             // Most profiler tests can be run in parallel with each other as they use test-specific
             // databases, with the exception of tests which modify slowms or the profiler's sampling
             // rate, since those affect profile settings globally.
-            parallelFilesDir + "/apitest_db_profile_level.js",
-            parallelFilesDir + "/geo_s2cursorlimitskip.js",
-            parallelFilesDir + "/profile1.js",
-            parallelFilesDir + "/profile2.js",
-            parallelFilesDir + "/profile3.js",
-            parallelFilesDir + "/profile_agg.js",
-            parallelFilesDir + "/profile_count.js",
-            parallelFilesDir + "/profile_delete.js",
-            parallelFilesDir + "/profile_distinct.js",
-            parallelFilesDir + "/profile_find.js",
-            parallelFilesDir + "/profile_findandmodify.js",
-            parallelFilesDir + "/profile_getmore.js",
-            parallelFilesDir + "/profile_hide_index.js",
-            parallelFilesDir + "/profile_insert.js",
-            parallelFilesDir + "/profile_list_collections.js",
-            parallelFilesDir + "/profile_list_indexes.js",
-            parallelFilesDir + "/profile_mapreduce.js",
-            parallelFilesDir + "/profile_no_such_db.js",
-            parallelFilesDir + "/profile_query_hash.js",
-            parallelFilesDir + "/profile_sampling.js",
-            parallelFilesDir + "/profile_update.js",
-            parallelFilesDir + "/cached_plan_trial_does_not_discard_work.js",
+            parallelFilesDir + "/api/apitest_db_profile_level.js",
+            parallelFilesDir + "/index/geo/geo_s2cursorlimitskip.js",
+            parallelFilesDir + "/administrative/profile/profile1.js",
+            parallelFilesDir + "/administrative/profile/profile2.js",
+            parallelFilesDir + "/administrative/profile/profile3.js",
+            parallelFilesDir + "/administrative/profile/profile_agg.js",
+            parallelFilesDir + "/administrative/profile/profile_count.js",
+            parallelFilesDir + "/administrative/profile/profile_delete.js",
+            parallelFilesDir + "/administrative/profile/profile_distinct.js",
+            parallelFilesDir + "/administrative/profile/profile_find.js",
+            parallelFilesDir + "/administrative/profile/profile_findandmodify.js",
+            parallelFilesDir + "/administrative/profile/profile_getmore.js",
+            parallelFilesDir + "/administrative/profile/profile_hide_index.js",
+            parallelFilesDir + "/administrative/profile/profile_insert.js",
+            parallelFilesDir + "/administrative/profile/profile_list_collections.js",
+            parallelFilesDir + "/administrative/profile/profile_list_indexes.js",
+            parallelFilesDir + "/administrative/profile/profile_mapreduce.js",
+            parallelFilesDir + "/administrative/profile/profile_no_such_db.js",
+            parallelFilesDir + "/administrative/profile/profile_query_hash.js",
+            parallelFilesDir + "/administrative/profile/profile_sampling.js",
+            parallelFilesDir + "/administrative/profile/profile_update.js",
+            parallelFilesDir + "/query/plan_cache/cached_plan_trial_does_not_discard_work.js",
             parallelFilesDir + "/sbe/from_plan_cache_flag.js",
             parallelFilesDir + "/timeseries/bucket_unpacking_with_sort_plan_cache.js",
 
             // These tests rely on a deterministically refreshable logical session cache. If they
             // run in parallel, they could interfere with the cache and cause failures.
-            parallelFilesDir + "/list_all_local_sessions.js",
-            parallelFilesDir + "/list_all_sessions.js",
-            parallelFilesDir + "/list_sessions.js",
+            parallelFilesDir + "/administrative/list_all_local_sessions.js",
+            parallelFilesDir + "/administrative/list_all_sessions.js",
+            parallelFilesDir + "/administrative/list_sessions.js",
         ];
         var serialTests = makeKeys(serialTestsArr);