SERVER-72901 Move remaining top-level core jstests to subdirectories (#30813)

GitOrigin-RevId: 0d2fb90192f7a0074b635f2707a482e8fe238cd2

.github/CODEOWNERS

@@ -390,15 +390,8 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/concurrency/fsm_workloads_no_passthrough_with_mongod/**/external_data_source.js @10gen/query-integration-analytic-extensions @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/OWNERS.yml
-/jstests/core/**/connection_string_validation.js @10gen/server-networking-and-observability @svc-auto-approve-bot
-/jstests/core/**/hostinfo.js @10gen/server-networking-and-observability @svc-auto-approve-bot
-/jstests/core/**/diagdata.js @10gen/server-networking-and-observability @svc-auto-approve-bot
-/jstests/core/**/failcommand_failpoint.js @10gen/server-programmability @svc-auto-approve-bot
 /jstests/core/capped/* @10gen/server-collection-write-path @svc-auto-approve-bot
 /jstests/core/clustered/* @10gen/server-collection-write-path @svc-auto-approve-bot
-/jstests/core/**/splitvector.js @10gen/server-cluster-scalability @svc-auto-approve-bot
-/jstests/core/**/opcounters_write_cmd.js @10gen/query-integration-observability @svc-auto-approve-bot
-/jstests/core/**/operation_latency_histogram.js @10gen/query-integration-observability @svc-auto-approve-bot
 /jstests/core/**/version_api* @10gen/query-optimization-parsers @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/administrative/current_op/OWNERS.yml
@@ -416,6 +409,9 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/core/cluster_parameters/OWNERS.yml
 /jstests/core/cluster_parameters/**/* @10gen/server-catalog-and-routing @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/core/cluster_scalability_misc/OWNERS.yml
+/jstests/core/cluster_scalability_misc/**/* @10gen/server-cluster-scalability @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/core/ddl/OWNERS.yml
 /jstests/core/ddl/**/* @10gen/server-catalog-and-routing @svc-auto-approve-bot
 
@@ -425,6 +421,10 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/core/index/OWNERS.yml
 /jstests/core/index/**/* @10gen/query @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/core/js/OWNERS.yml
+/jstests/core/js/**/* @10gen/query-integration-javascript @svc-auto-approve-bot
+/jstests/core/js/**/json1.js @10gen/query-optimization-parsers @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/core/query/OWNERS.yml
 /jstests/core/query/**/* @10gen/query @svc-auto-approve-bot
 /jstests/core/query/**/boolean_expression_simplification.js @10gen/query-optimization-heuristic-rewrite @svc-auto-approve-bot
@@ -528,6 +528,9 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/core/replicate_record_ids/OWNERS.yml
 /jstests/core/replicate_record_ids/**/* @10gen/server-storage-engine-integration @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/core/testing/OWNERS.yml
+/jstests/core/testing/**/* @10gen/server-programmability @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/core/timeseries/OWNERS.yml
 /jstests/core/timeseries/**/* @10gen/server-collection-write-path @svc-auto-approve-bot
 

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_causally_consistent_jscore_passthrough.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js
@@ -52,11 +52,11 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_jscore_passthrough.yml

@@ -42,7 +42,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js
@@ -50,11 +50,11 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml

@@ -99,16 +99,16 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
     - jstests/core/timeseries/write/timeseries_delete_hint.js
     - jstests/core/**/set_param1.js
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_jscore_passthrough.yml

@@ -186,11 +186,11 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_kill_stepdown_terminate_jscore_passthrough.yml

@@ -220,11 +220,11 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_causally_consistent_jscore_passthrough.yml

@@ -78,11 +78,11 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_collections_jscore_passthrough.yml

@@ -78,11 +78,11 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_multi_stmt_txn_jscore_passthrough.yml

@@ -201,11 +201,11 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     - jstests/core/query/explain/explain_uuid.js
     - jstests/core/query/explain/explain_includes_command.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_change_collection_replica_sets_stepdown_primary_jscore_passthrough.yml

@@ -136,7 +136,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
     - jstests/aggregation/**/*.js
   exclude_with_any_tags:
     - simulate_atlas_proxy_incompatible

buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_pre_images_replica_sets_stepdown_primary_jscore_passthrough.yml

@@ -111,7 +111,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
     - jstests/fle2/**/*.js
     - src/mongo/db/modules/*/jstests/fle2/**/*.js
   exclude_with_any_tags:

buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check.yml

@@ -42,7 +42,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_new_old.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_old_new.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_old_new_new.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_new_old.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_old_new.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_old_new_new.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/no_causal_consistency_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml

@@ -101,7 +101,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
     - jstests/fle2/**/*.js
     - src/mongo/db/modules/*/jstests/fle2/**/*.js
   exclude_with_any_tags:

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_new_old.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_old_new.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_old_new_new.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_new_old.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_old_new.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_old_new_new.yml

@@ -44,7 +44,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_fallback.yml

@@ -46,7 +46,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js
@@ -57,14 +57,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_hints.yml

@@ -49,7 +49,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js
@@ -60,14 +60,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_query_shape_hash_stability.yml

@@ -46,7 +46,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js
@@ -57,14 +57,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough.yml

@@ -101,7 +101,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
     - jstests/fle2/**/*.js
     - src/mongo/db/modules/*/jstests/fle2/**/*.js
   exclude_with_any_tags:

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_new_old.yml

@@ -102,7 +102,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
     - jstests/fle2/**/*.js
     - src/mongo/db/modules/*/jstests/fle2/**/*.js
   exclude_with_any_tags:

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_old_old.yml

@@ -102,7 +102,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
     - jstests/fle2/**/*.js
     - src/mongo/db/modules/*/jstests/fle2/**/*.js
   exclude_with_any_tags:

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml

@@ -105,7 +105,7 @@ selector:
     - jstests/core/**/geo_s2ordering.js
     - jstests/fle2/**/*.js
     - src/mongo/db/modules/*/jstests/fle2/**/*.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
   exclude_with_any_tags:
     - assumes_standalone_mongod
     - requires_getmore

buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_recordids_replicated_jscore_passthrough.yml

@@ -42,7 +42,7 @@ selector:
     - jstests/core/**/set_param1.js
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
     - jstests/core/timeseries/write/timeseries_update_multi.js
@@ -56,11 +56,11 @@ selector:
     - jstests/core/catalog/agg_list_cluster_catalog_with_match.js
     - jstests/core/write/bulk/bulk_write_timeseries_basic.js
     - jstests/core/ddl/convert_to_capped.js
-    - jstests/core/rename_system_buckets_collections.js
+    - jstests/core/timeseries/ddl/rename_system_buckets_collections.js
     - jstests/core/query/index_correctness_pbt.js
     - jstests/core/query/plan_cache/cache_correctness_pbt.js
     - jstests/core/write/empty_ts/bypass_empty_ts_replacement_timeseries.js
-    - jstests/core/version_api_v1_command_coverage.js
+    - jstests/core/stable_api/version_api_v1_command_coverage.js
     - jstests/core/query/api/*.js
     - jstests/core/query/distinct/*.js
     - jstests/core/query/cursor/cursora.js
@@ -70,7 +70,7 @@ selector:
     - jstests/core/query/find_and_modify/find_and_modify_concurrent_update.js
     - jstests/core/administrative/compact_keeps_indexes.js
     - jstests/core/query/update/update_namespace_details.js
-    - jstests/core/loadserverscripts.js
+    - jstests/core/shell/loadserverscripts.js
     - jstests/core/shell/shellstartparallel.js
     - jstests/core/txns/*.js
     - jstests/core/query/map_reduce/mr_killop.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_fallback.yml

@@ -86,14 +86,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_hints.yml

@@ -88,14 +88,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_query_shape_hash_stability.yml

@@ -85,14 +85,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_continuous_new_old_old_new.yml

@@ -126,7 +126,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
   exclude_with_any_tags:
     - assumes_standalone_mongod
     - assumes_against_mongod_not_mongos

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_lts_new_old_old_new.yml

@@ -126,7 +126,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
   exclude_with_any_tags:
     - assumes_standalone_mongod
     - assumes_against_mongod_not_mongos

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown_terminate_jscore_passthrough.yml

@@ -126,7 +126,7 @@ selector:
     - jstests/core/**/startup_log.js
     - jstests/core/**/shell_connection_strings.js
     - jstests/core/**/geo_s2ordering.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
   exclude_with_any_tags:
     - assumes_standalone_mongod
     - assumes_against_mongod_not_mongos

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_fallback.yml

@@ -63,14 +63,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_hints.yml

@@ -66,14 +66,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_query_shape_hash_stability.yml

@@ -63,14 +63,14 @@ selector:
     - jstests/core/query/query_settings/**/*.js
     - jstests/core/administrative/current_op/**/*.js
     - jstests/core/query/collation/collation.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/query/top/top.js
     - jstests/core/views/views_stats.js
     - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js
     - jstests/core/timeseries/ddl/timeseries_sparse_index.js
     - jstests/core/administrative/getlog2.js
     - jstests/core/txns/speculative_snapshot_includes_all_writes.js
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     - jstests/core/clustered/clustered_collection_collation.js
     - jstests/core/timeseries/write/timeseries_delete_multi.js
     - jstests/core/timeseries/write/timeseries_simple.js

buildscripts/resmokeconfig/matrix_suites/overrides/bulk_write.yml

@@ -18,14 +18,14 @@
       # BulkWrite profiling and currentOp output format is not the same as normal writes.
       - jstests/core/**/profile*.js
       - jstests/core/query/comment_field.js
-      - jstests/core/fsync.js
+      - jstests/core/administrative/fsync.js
       # Runs an update with illegal format (no 'updates'). We could work around this in the override
       # but it is very annoying.
       - jstests/core/write/insert/batch_write_command_insert.js
       - jstests/core/query/batch_write/batch_write_command_update.js
       - jstests/core/query/batch_write/batch_write_command_delete.js
       # Requires specific commands to be run to trigger failpoint (i.e. requires insert, we run bulkWrite).
-      - jstests/core/failcommand_failpoint.js
+      - jstests/core/testing/failcommand_failpoint.js
       # This test adds unknown fields to insert/update/delete ops which we ignore
       - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
       # Expects explain to fail for using UUID instead of collection name.

buildscripts/resmokeconfig/matrix_suites/overrides/query_settings.yml

@@ -13,7 +13,7 @@
       # this suite might cause the tests to fail.
       - jstests/core/administrative/current_op/**/*.js
       - jstests/core/query/collation/collation.js
-      - jstests/core/operation_latency_histogram.js
+      - jstests/core/diagnostics/operation_latency_histogram.js
       - jstests/core/query/top/top.js
       - jstests/core/views/views_stats.js
       - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js # failpoint 'timesEntered'
@@ -24,7 +24,7 @@
       # Failpoint interferes with majority commited writes.
       - jstests/core/txns/speculative_snapshot_includes_all_writes.js
       # Using collection UUID in explain is forbidden.
-      - jstests/core/commands_with_uuid.js
+      - jstests/core/query/commands_with_uuid.js
       # This test performs an '{_id: <id>}' query with a collator. This will not pass query settings validation. This
       # is a design decision due to mongos lacking collation information.
       - jstests/core/clustered/clustered_collection_collation.js

buildscripts/resmokeconfig/matrix_suites/overrides/recordids_replicated.yml

@@ -16,12 +16,12 @@
       - jstests/core/catalog/agg_list_cluster_catalog_with_match.js
       - jstests/core/write/bulk/bulk_write_timeseries_basic.js
       - jstests/core/ddl/convert_to_capped.js
-      - jstests/core/rename_system_buckets_collections.js
+      - jstests/core/timeseries/ddl/rename_system_buckets_collections.js
       - jstests/core/query/index_correctness_pbt.js
       - jstests/core/query/plan_cache/cache_correctness_pbt.js
       - jstests/core/write/empty_ts/bypass_empty_ts_replacement_timeseries.js
       # due to error: "BSON field 'create.recordIdsReplicated' is not allowed with apiStrict:true."
-      - jstests/core/version_api_v1_command_coverage.js
+      - jstests/core/stable_api/version_api_v1_command_coverage.js
       - jstests/core/query/api/*.js
       # due to error: Error: [0] != [1] are not equal : encountered an error in the parallel shell
       - jstests/core/query/distinct/*.js
@@ -32,7 +32,7 @@
       - jstests/core/query/find_and_modify/find_and_modify_concurrent_update.js
       - jstests/core/administrative/compact_keeps_indexes.js
       - jstests/core/query/update/update_namespace_details.js
-      - jstests/core/loadserverscripts.js
+      - jstests/core/shell/loadserverscripts.js
       - jstests/core/shell/shellstartparallel.js
       # due to error: "Transaction with { txnNumber: 0 } has been aborted."
       # The overrides don't work with renaming collections in general.

buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml

@@ -52,7 +52,7 @@
         - jstests/core/**/geo_s2ordering.js
 
         # This test may fail due to network errors and does not test server behavior, so exclude it.
-        - jstests/core/mixed_version_replica_set.js
+        - jstests/core/testing/mixed_version_replica_set.js
 
 - name: kill_primary_jscore_passthrough_exclude_files_fle
   value:
@@ -139,7 +139,7 @@
         - src/mongo/db/modules/*/jstests/fle2/**/*.js
 
         # This test may fail due to network errors and does not test server behavior, so exclude it.
-        - jstests/core/mixed_version_replica_set.js
+        - jstests/core/testing/mixed_version_replica_set.js
 
 - name: kill_primary_jscore_passthrough_exclude_with_any_tags
   value:

buildscripts/resmokeconfig/suites/bulk_write_multi_op_causally_consistent_jscore_passthrough.yml

@@ -13,14 +13,14 @@ selector:
     # BulkWrite profiling and currentOp output format is not the same as normal writes.
     - jstests/core/**/profile*.js
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     # Runs an update with illegal format (no 'updates'). We could work around this in the override
     # but it is very annoying.
     - jstests/core/write/insert/batch_write_command_insert.js
     - jstests/core/query/batch_write/batch_write_command_update.js
     - jstests/core/query/batch_write/batch_write_command_delete.js
     # Requires specific commands to be run to trigger failpoint (i.e. requires insert, we run bulkWrite).
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     # This test adds unknown fields to insert/update/delete ops which we ignore
     - jstests/core/query/parsing/write_commands_reject_unknown_fields.js
     # Checks for op names which bulkWrite will not show up as
@@ -42,7 +42,7 @@ selector:
     - jstests/core/query/update/update_affects_indexes.js
     - jstests/core/index/index_arr2.js
     - jstests/core/index/index_stats.js
-    - jstests/core/ts1.js
+    - jstests/core/write/ts1.js
     - jstests/core/query/compare_timestamps.js
     - jstests/core/query/command_let_variables.js
     - jstests/core/query/update/update_min_max_examples.js
@@ -91,8 +91,8 @@ selector:
     - jstests/core/txns/no_snapshot_writes_outside_txn.js
 
     # override does not suppot benchRun
-    - jstests/core/benchrun_pipeline_updates.js
+    - jstests/core/shell/benchrun_pipeline_updates.js
-    - jstests/core/bench_test1.js
+    - jstests/core/shell/bench_test1.js
 
     # errors out due to invalid DB name
     - jstests/core/query/invalid_db_name.js
@@ -145,7 +145,7 @@ selector:
     # Grabs specific stats from mongod directly which causes failure due to there being
     # multiple clusters.
     - jstests/core/administrative/current_op/currentop_cursors.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/views/views_stats.js
 
     # Sets cluster parameters, which do writes with timestamps that will vary b/w clusters.

buildscripts/resmokeconfig/suites/bulk_write_multi_op_sharded_collections_jscore_passthrough.yml

@@ -67,7 +67,7 @@ selector:
     - jstests/core/query/update/update_affects_indexes.js
     - jstests/core/index/index_arr2.js
     - jstests/core/index/index_stats.js
-    - jstests/core/ts1.js
+    - jstests/core/write/ts1.js
     - jstests/core/query/compare_timestamps.js
     - jstests/core/query/command_let_variables.js
     - jstests/core/query/update/update_min_max_examples.js
@@ -116,8 +116,8 @@ selector:
     - jstests/core/txns/no_snapshot_writes_outside_txn.js
 
     # override does not suppot benchRun
-    - jstests/core/benchrun_pipeline_updates.js
+    - jstests/core/shell/benchrun_pipeline_updates.js
-    - jstests/core/bench_test1.js
+    - jstests/core/shell/bench_test1.js
 
     # parallel processing causes race conditions in these tests
     - jstests/core/query/local_tail_capped.js
@@ -172,16 +172,16 @@ selector:
     # Grabs specific stats from mongod directly which causes failure due to there being
     # multiple clusters.
     - jstests/core/administrative/current_op/currentop_cursors.js
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
     - jstests/core/views/views_stats.js
 
     # Rely on the testingReplication field
-    - jstests/core/hello_response_validation.js
+    - jstests/core/administrative/hello_response_validation.js
     - jstests/core/index/geo/geo_update_btree.js
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
 
     # Requires specific commands to be run to trigger failpoint (i.e. requires insert, we run bulkWrite).
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
 
     # Sets cluster parameters, which do writes with timestamps that will vary b/w clusters.
     - jstests/core/cluster_parameters/cluster_parameter_commands.js

buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_replica_sets_jscore_passthrough.yml

@@ -65,7 +65,7 @@ selector:
     - src/mongo/db/modules/*/jstests/fle/fle_drivers_integration.js
 
     # Expected failure due to command count being not precise due to potential retry of index build.
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
 
     # Expected failures due to unexpected query execution stats from restarted operations from fcv upgrade.
     - jstests/aggregation/sources/lookup/lookup_query_stats.js
@@ -82,8 +82,8 @@ selector:
     - jstests/core/write/crud_ops_do_not_throw_locktimeout.js
 
     # The tests below use transactions (which are aborted on fcv upgrade/downgrade) and thus are expected to fail.
-    - jstests/core/role_management_helpers.js
+    - jstests/core/shell/role_management_helpers.js
-    - jstests/core/roles_info.js
+    - jstests/core/administrative/roles_info.js
     - jstests/core/views/views_all_commands.js
 
     # Queryable encryption uses internal transactions (which are aborted on fcv upgrade/downgrade).
@@ -100,7 +100,7 @@ selector:
     - jstests/aggregation/sources/lookup/profile_lookup.js
 
     # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail.
-    - jstests/core/bench_test1.js
+    - jstests/core/shell/bench_test1.js
 
 executor:
   archive:

buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharded_collections_jscore_passthrough.yml

@@ -75,7 +75,7 @@ selector:
     - src/mongo/db/modules/*/jstests/fle/fle_drivers_integration.js
 
     # Expected failure due to command count being not precise due to potential retry of index build.
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
 
     # Expected failures due to unexpected query execution stats from restarted operations from fcv upgrade.
     - jstests/aggregation/sources/lookup/lookup_query_stats.js
@@ -174,8 +174,8 @@ selector:
     - jstests/core/write/crud_ops_do_not_throw_locktimeout.js
 
     # The tests below use transactions (which are aborted on fcv upgrade/downgrade) and thus are expected to fail.
-    - jstests/core/role_management_helpers.js
+    - jstests/core/shell/role_management_helpers.js
-    - jstests/core/roles_info.js
+    - jstests/core/administrative/roles_info.js
     - jstests/core/views/views_all_commands.js
 
     # The following test timesout due to fcv downgrade interfering with index build (see BF-29538)
@@ -212,7 +212,7 @@ selector:
     - jstests/core/query/top/top.js
 
     # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail.
-    - jstests/core/bench_test1.js
+    - jstests/core/shell/bench_test1.js
 
     # TODO (SERVER-95788): This test creates a capped collection and fails because this suite is not
     # compatible with them (they can't be sharded), but does not exclude the `requires_capped` tag.

buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharding_jscore_passthrough.yml

@@ -50,7 +50,7 @@ selector:
     - src/mongo/db/modules/*/jstests/fle/fle_drivers_integration.js
 
     # Expected failure due to command count being not precise due to potential retry of index build.
-    - jstests/core/operation_latency_histogram.js
+    - jstests/core/diagnostics/operation_latency_histogram.js
 
     # Expected failures due to unexpected query execution stats from restarted operations from fcv upgrade.
     - jstests/aggregation/sources/lookup/lookup_query_stats.js
@@ -65,8 +65,8 @@ selector:
     - jstests/core/write/crud_ops_do_not_throw_locktimeout.js
 
     # The tests below use transactions (which are aborted on fcv upgrade/downgrade) and thus are expected to fail.
-    - jstests/core/role_management_helpers.js
+    - jstests/core/shell/role_management_helpers.js
-    - jstests/core/roles_info.js
+    - jstests/core/administrative/roles_info.js
     - jstests/core/views/views_all_commands.js
 
     # Sharding specific failed:
@@ -90,7 +90,7 @@ selector:
     - jstests/core/query/top/top.js
 
     # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail.
-    - jstests/core/bench_test1.js
+    - jstests/core/shell/bench_test1.js
 
     # Resharding is not permitted during fcv upgrade and downgrade.
     - jstests/core_sharding/resharding/*.js

buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml

@@ -31,7 +31,7 @@ selector:
     # enters a wait state. Additionally, since the AquireCollection is not even obtained,
     # the curOp (current operation) does not get logged.
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     # When a transaction is in a prepared state, as seen in that test, it prevents the document edited
     # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction
     # in a prepared state for an extended period, it will result in a timeout for the dbcheck process.
@@ -40,7 +40,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/testing/failcommand_failpoint.js
 
     # Uses a view with projected out _id which causes data consistency diffs due to natural order
     # differences between primary and secondary nodes from parallel oplog application.

buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml

@@ -74,7 +74,7 @@ selector:
     - jstests/core/query/queryable_encryption/**/*.js
     # Failpoints do not support passing in tenancy information.
     - jstests/core/administrative/profile/profile_hide_index.js
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     - jstests/core/query/comment_field.js
 
 executor:

buildscripts/resmokeconfig/suites/replica_sets_configsvr_param_jscore_passthrough.yml

@@ -38,7 +38,7 @@ selector:
     # enters a wait state. Additionally, since the AquireCollection is not even obtained,
     # the curOp (current operation) does not get logged.
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     # When a transaction is in a prepared state, as seen in that test, it prevents the document edited
     # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction
     # in a prepared state for an extended period, it will result in a timeout for the dbcheck process.

buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml

@@ -31,7 +31,7 @@ selector:
     # enters a wait state. Additionally, since the AquireCollection is not even obtained,
     # the curOp (current operation) does not get logged.
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     # When a transaction is in a prepared state, as seen in that test, it prevents the document edited
     # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction
     # in a prepared state for an extended period, it will result in a timeout for the dbcheck process.

buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough_with_replica_set_endpoint.yml

@@ -40,7 +40,7 @@ selector:
     # enters a wait state. Additionally, since the AquireCollection is not even obtained,
     # the curOp (current operation) does not get logged.
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     # When a transaction is in a prepared state, as seen in that test, it prevents the document edited
     # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction
     # in a prepared state for an extended period, it will result in a timeout for the dbcheck process.
@@ -80,7 +80,7 @@ selector:
     # clusters for non-existent dbs.
     - jstests/core/query/explain/explain_missing_database.js
     # This test runs {find: uuid} commands which are not supported for replica set endpoints.
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     # TODO (SERVER-80416): cloneCollectionAsCapped command stops working after a replica set
     # is bootstrapped as a sharded cluster.
     - jstests/core/query/collation/collation.js

buildscripts/resmokeconfig/suites/replica_sets_lag_oplog_application_jscore_passthrough.yml

@@ -30,7 +30,7 @@ selector:
     # enters a wait state. Additionally, since the AquireCollection is not even obtained,
     # the curOp (current operation) does not get logged.
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     # When a transaction is in a prepared state, as seen in that test, it prevents the document edited
     # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction
     # in a prepared state for an extended period, it will result in a timeout for the dbcheck process.

buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_stepdown_terminate_jscore_passthrough.yml

@@ -75,7 +75,7 @@ selector:
     # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary.
     - jstests/core/**/geo_s2ordering.js
     # This test may fail due to network errors and does not test server behavior, so exclude it.
-    - jstests/core/mixed_version_replica_set.js
+    - jstests/core/testing/mixed_version_replica_set.js
 
   exclude_with_any_tags:
     - assumes_standalone_mongod

buildscripts/resmokeconfig/suites/replica_sets_uninitialized_fcv_jscore_passthrough.yml

@@ -40,7 +40,7 @@ selector:
     - jstests/core/**/write_change_stream_pit_preimage.js
 
     # Will fail all commands including those needed to forward command to initial sync node.
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     # Starts MongoCryptD instead of mongod nodes
     - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js
     # These tests run many aggregations, and the override slows them down enough to hit the evergreen timeout.

buildscripts/resmokeconfig/suites/secondary_reads_passthrough_with_replica_set_endpoint.yml

@@ -68,7 +68,7 @@ selector:
     # clusters for non-existent dbs.
     - jstests/core/query/explain/explain_missing_database.js
     # This test runs {find: uuid} commands which are not supported for replica set endpoints.
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     # TODO (SERVER-80416): cloneCollectionAsCapped command stops working after a replica set
     # is bootstrapped as a sharded cluster.
     - jstests/core/query/collation/collation.js
@@ -84,7 +84,7 @@ selector:
     # writes the test database, it should remain empty or non-existent. This suite breaks this
     # assumption since it enables profiling which creates the system.profile collection.
     - jstests/core/ddl/clone_collection_as_capped_non_existent.js
-    - jstests/core/no_db_created.js
+    - jstests/core/write/no_db_created.js
     - jstests/core/query/explain/explain_find_and_modify.js
     # The test below expects the listCollections command that it runs to not validate the views
     # that the collection has since the command uses the special filter used by initial sync which

buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_config_transitions.yml

@@ -174,7 +174,7 @@ selector:
     # concurrent migration fails due to the config shard transitioning to dedicated.
     - jstests/core/administrative/cleanup_orphaned.js
     - jstests/core/views/views_all_commands.js
-    - jstests/core/commands_namespace_parsing.js
+    - jstests/core/repro/commands_namespace_parsing.js
     # Runs commands using legacy queries, which are not supported on sessions.
     - jstests/core/**/query/exhaust.js
     # TODO SERVER-96199 Re-enable this test once FLE updates to a document's shard key work

buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_replica_set_endpoint.yml

@@ -66,7 +66,7 @@ selector:
 
     # The tests below are disabled because of embedded router role and replica set endpoint.
     # This test runs {find: uuid} commands which are not supported for replica set endpoints.
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     # This test cares about command metrics, and fails under this suite.
     - jstests/core/query/query_settings/query_settings_reject_application.js
     # The 'queryShapeHash' is only computed on mongos in sharded clusters, therefore the test will fail

buildscripts/resmokeconfig/suites/sharded_collections_uninitialized_fcv_jscore_passthrough.yml

@@ -92,7 +92,7 @@ selector:
     - jstests/core/**/sort_array.js
 
     # Will fail all commands including those needed to forward command to initial sync node.
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     # Starts MongoCryptD instead of mongod nodes
     - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js
     # These tests run many aggregations, and the override slows them down enough to hit the evergreen timeout.

buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_config_transitions.yml

@@ -48,7 +48,7 @@ selector:
     # along with the MovePrimaryInProgress error. Since this test sets times: n
     # for some of the failpoints, by the time we retry, the failpoint will no
     # longer be active and the test will fail.
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
 
     # TODO (SERVER-90646): Re-enable background_unique_indexes.js in config transition suites.
     - jstests/core/ddl/background_unique_indexes.js
@@ -57,7 +57,7 @@ selector:
     # concurrent migration fails due to the config shard transitioning to dedicated.
     - jstests/core/administrative/cleanup_orphaned.js
     - jstests/core/views/views_all_commands.js
-    - jstests/core/commands_namespace_parsing.js
+    - jstests/core/repro/commands_namespace_parsing.js
     # TODO SERVER-96199 Re-enable this test once FLE updates to a document's shard key work
     - src/mongo/db/modules/enterprise/jstests/fle2/find_and_modify_replace.js
     # TODO SERVER-86443 Enable test once featureFlagTrackUnshardedCollectionsUponCreation is enabled

buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_replica_set_endpoint.yml

@@ -42,7 +42,7 @@ selector:
     - jstests/core/query/find_and_modify/find_and_modify_metrics.js
     - jstests/core/query/update/update_metrics.js
     # This test runs {find: uuid} commands which are not supported for replica set endpoints.
-    - jstests/core/commands_with_uuid.js
+    - jstests/core/query/commands_with_uuid.js
     # TODO (SERVER-80416): cloneCollectionAsCapped command stops working after a replica set
     # is bootstrapped as a sharded cluster.
     - jstests/core/query/collation/collation.js

buildscripts/resmokeconfig/suites/sharding_uninitialized_fcv_jscore_passthrough.yml

@@ -65,7 +65,7 @@ selector:
     - jstests/core/**/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880.
 
     # Will fail all commands including those needed to forward command to initial sync node.
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
     # Starts MongoCryptD instead of mongod nodes
     - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js
     # analyzeShardKey cannot run directly on a shard replica set

buildscripts/resmokeconfig/suites/timeseries_crud_jscore_passthrough.yml

@@ -2,7 +2,6 @@ test_kind: js_test
 
 selector:
   roots:
-    - jstests/core/*.js
     - jstests/core/query/**/*.js
     - jstests/core/write/**/*.js
   exclude_files:
@@ -21,7 +20,7 @@ selector:
     - jstests/core/query/find_with_resume_after_param.js
     - jstests/core/query/or_use_clustered_collection.js
     # Unique indexes.
-    - jstests/core/uniqueness.js
+    - jstests/core/write/uniqueness.js
     - jstests/core/query/bulk/bulk_api_ordered.js
     - jstests/core/query/bulk/bulk_api_unordered.js
     # Time-series is not compatible with viewOn.
@@ -31,7 +30,6 @@ selector:
     - jstests/core/query/collection_uuid_find.js
     - jstests/core/query/parsing/collection_uuid_write_commands.js
     # Time-series is not allowed with an explicit validator.
-    - jstests/core/list_namespaces_invalidation.js
     - jstests/core/query/bulk/bulk_write.js
     - jstests/core/write/bulk/bulk_write_non_transaction.js
     # Sparse indexes.
@@ -130,12 +128,10 @@ selector:
     # Update operator results in document without a time field.
     - jstests/core/query/find_and_modify/collation_find_and_modify.js
     # The passthrough creates collections implicitly.
-    - jstests/core/no_db_created.js
+    - jstests/core/write/no_db_created.js
     - jstests/core/query/invalid_db_name.js
     # Time-series collections have different _id properties.
-    - jstests/core/dbhash.js
     - jstests/core/query/embedded_dollar_prefixed_field_validation.js
-    - jstests/core/failcommand_failpoint.js
     - jstests/core/query/field_name_validation.js
     - jstests/core/query/regex/regex_not_id.js
     - jstests/core/query/rename/rename_operator.js
@@ -157,13 +153,8 @@ selector:
     - jstests/core/query/top/top.js
     - jstests/core/query/top/top_drop.js
     # Buckets collection creates compounded secondary indexes, which is not compatible with wildcard indexes.
-    - jstests/core/compound_index_max_fields.js
     - jstests/core/query/update/update_with_pipeline.js
     # Operations not allowed on views.
-    - jstests/core/datasize2.js # locking
-    - jstests/core/datasize_validation.js # locking
-    - jstests/core/filemd5.js # locking
-    - jstests/core/long_index_rename.js # rename
     - jstests/core/query/project/positional_projection_multiple_array_fields.js # $slice
     - jstests/core/query/elemmatch/**/*.js # $elemMatch
     - jstests/core/query/plan_cache/elem_match_index_diff_types.js # $elemMatch
@@ -173,7 +164,6 @@ selector:
     - jstests/core/query/project/slice1.js # $slice
     - jstests/core/query/find_and_modify/find_and_modify_positional_new_remove.js # $elemMatch
     # Time-series collections are views which don't support map-reduce
-    - jstests/core/commands_namespace_parsing.js
     - jstests/core/query/map_reduce/constructors.js
     - jstests/core/query/function_string_representations.js
     - jstests/core/query/map_reduce/map_reduce_validation.js
@@ -181,12 +171,10 @@ selector:
     - jstests/core/query/map_reduce/**/*.js
     - jstests/core/query/recursion.js
     # Incompatible aggregation operations.
-    - jstests/core/benchrun_pipeline_updates.js
     - jstests/core/query/command_let_variables_merge_only.js # merge
     - jstests/core/query/exhaust.js # singleBatch
     - jstests/core/query/kill_cursors.js # noCursorTimeout
     - jstests/core/query/min_max_bounds.js # min
-    - jstests/core/operation_latency_histogram.js
     - jstests/core/query/project/positional_projection.js # Positional projection
     - jstests/core/query/batch_size.js # singleBatch
     - jstests/core/query/dbref/dbref3.js # Positional projection
@@ -256,7 +244,7 @@ selector:
     # Different error message due to the override.
     - jstests/core/query/update/update_arrayFilters.js
     # TODO(SERVER-84158): Try to include this test(s).
-    - jstests/core/depth_limit.js
+    - jstests/core/write/depth_limit.js
     - jstests/core/query/mod/mod_with_where.js
     - jstests/core/query/and/and.js
     - jstests/core/query/cursor/cursora.js
@@ -272,7 +260,7 @@ selector:
     - jstests/core/query/resume_query.js
     - jstests/core/query/resume_query_from_non_existent_record.js
     # Inserting into a time-series collection does not replace top-level empty timestamps.
-    - jstests/core/ts1.js
+    - jstests/core/write/ts1.js
     # Cursor manipulation incompatible with count 'applySkipLimit' option.
     - jstests/core/query/count/count2.js
     # Known unclear issues with distinct.
@@ -282,7 +270,6 @@ selector:
     - jstests/core/query/sort/sortl.js
     # Parallel shell not running through the override.
     - jstests/core/query/comment_field.js
-    - jstests/core/fsync.js
     # Time-series buckets processing may have different cursor behavior.
     - jstests/core/query/cursor/getmore_invalidated_cursors.js
     # For inserts on time-series collections, mongod does _not_ replace empty timestamp values
@@ -292,8 +279,6 @@ selector:
     - jstests/core/write/empty_ts/bypass_empty_ts_replacement.js
     - jstests/core/write/empty_ts/bypass_empty_ts_replacement_bulk_write.js
     - jstests/core/write/empty_ts/bypass_empty_ts_replacement_timeseries.js
-    # Assumes collection options do not change
-    - jstests/core/rename_system_buckets_collections.js
     # Change stream pre-/post-images are not available for time-series collections.
     - jstests/core/query/change_streams_pre_and_post_images_in_create_and_collmod.js
     # Inserts documents that are too large for a timeseries collection.

buildscripts/resmokeconfig/suites/v1index_jscore_passthrough.yml

@@ -29,7 +29,7 @@ selector:
     # These tests fails while DbCheck running in the background:
     - jstests/core/query/awaitdata_getmore_cmd.js
     - jstests/core/administrative/current_op/currentop.js
-    - jstests/core/fsync.js
+    - jstests/core/administrative/fsync.js
     - jstests/core/txns/prepare_conflict.js
     - jstests/core/txns/prepare_conflict_aggregation_behavior.js
   exclude_with_any_tags:

buildscripts/smoke_tests/server_programmability.yml

@@ -6,7 +6,7 @@
 
 suites:
   core:
-    - jstests/core/failcommand_failpoint.js
+    - jstests/core/testing/failcommand_failpoint.js
 
   failpoints:
     - jstests/fail_point/*.js

buildscripts/tests/resmoke_validation/test_find_suites.py

@@ -8,7 +8,7 @@ from buildscripts.resmokelib.suitesconfig import get_suite
 
 class TestFindSuites(unittest.TestCase):
     def test_find_suites(self):
-        jstests = glob.glob("jstests/core/*.js")
+        jstests = glob.glob("jstests/core/testing/*.js")
         resmoke_process = subprocess.run(
             ["python3", "buildscripts/resmoke.py", "find-suites", jstests[0]],
             stdout=subprocess.PIPE,

docs/fail_points.md

@@ -58,5 +58,5 @@ between nodes like invalid replica set configurations. For examples of use, see
 [fail_point_commands]: ../src/mongo/db/commands/fail_point_cmd.cpp
 [fail_point_util]: ../jstests/libs/fail_point_util.js
 [fail_point_javascript_test]: ../jstests/fail_point/fail_point.js
-[fail_command_javascript_test]: ../jstests/core/failcommand_failpoint.js
+[fail_command_javascript_test]: ../jstests/core/testing/failcommand_failpoint.js
 [test_only]: test_commands.md

etc/backports_required_for_multiversion_tests.yml

@@ -343,7 +343,7 @@ last-continuous:
       ticket: SERVER-94259
     - test_file: jstests/core/timeseries/ddl/timeseries_drop.js
       ticket: SERVER-94829
-    - test_file: jstests/core/connection_status.js
+    - test_file: jstests/core/administrative/connection_status.js
       ticket: SERVER-95952
     - test_file: jstests/sharding/resharding_skip_cloning_and_applying.js
       ticket: SERVER-91109
@@ -735,7 +735,7 @@ last-lts:
       ticket: SERVER-94259
     - test_file: jstests/core/timeseries/ddl/timeseries_drop.js
       ticket: SERVER-94829
-    - test_file: jstests/core/connection_status.js
+    - test_file: jstests/core/administrative/connection_status.js
       ticket: SERVER-95952
     - test_file: jstests/sharding/resharding_skip_cloning_and_applying.js
       ticket: SERVER-91109

jstests/core/OWNERS.yml

@@ -1,32 +1,11 @@
 version: 1.0.0
 filters:
-  - "connection_string_validation.js":
-    approvers:
-      - 10gen/server-networking-and-observability
-  - "hostinfo.js":
-    approvers:
-      - 10gen/server-networking-and-observability
-  - "diagdata.js":
-    approvers:
-      - 10gen/server-networking-and-observability
-  - "failcommand_failpoint.js":
-    approvers:
-      - 10gen/server-programmability
   - "capped/*":
     approvers:
       - 10gen/server-collection-write-path
   - "clustered/*":
     approvers:
       - 10gen/server-collection-write-path
-  - "splitvector.js":
-    approvers:
-      - 10gen/server-cluster-scalability
-  - "opcounters_write_cmd.js":
-    approvers:
-      - 10gen/query-integration-observability
-  - "operation_latency_histogram.js":
-    approvers:
-      - 10gen/query-integration-observability
   - "version_api*":
     approvers:
       - 10gen/query-optimization-parsers

jstests/core/cluster_scalability_misc/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/server-cluster-scalability

jstests/core/js/OWNERS.yml

@@ -0,0 +1,8 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-integration-javascript
+  - "json1.js":
+    approvers:
+      - 10gen/query-optimization-parsers