diff --git a/test/registered/distributed/test_flashinfer_fusion_preflight.py b/test/registered/backends/test_flashinfer_fusion_preflight.py
similarity index 100%
rename from test/registered/distributed/test_flashinfer_fusion_preflight.py
rename to test/registered/backends/test_flashinfer_fusion_preflight.py
diff --git a/test/registered/distributed/test_disaggregation_aarch64.py b/test/registered/disaggregation/test_disaggregation_aarch64.py
similarity index 100%
rename from test/registered/distributed/test_disaggregation_aarch64.py
rename to test/registered/disaggregation/test_disaggregation_aarch64.py
diff --git a/test/registered/distributed/test_disaggregation_decode_radix_cache.py b/test/registered/disaggregation/test_disaggregation_decode_radix_cache.py
similarity index 100%
rename from test/registered/distributed/test_disaggregation_decode_radix_cache.py
rename to test/registered/disaggregation/test_disaggregation_decode_radix_cache.py
diff --git a/test/registered/distributed/test_disaggregation_different_tp.py b/test/registered/disaggregation/test_disaggregation_different_tp.py
similarity index 100%
rename from test/registered/distributed/test_disaggregation_different_tp.py
rename to test/registered/disaggregation/test_disaggregation_different_tp.py
diff --git a/test/registered/distributed/test_disaggregation_dp_attention.py b/test/registered/disaggregation/test_disaggregation_dp_attention.py
similarity index 100%
rename from test/registered/distributed/test_disaggregation_dp_attention.py
rename to test/registered/disaggregation/test_disaggregation_dp_attention.py
diff --git a/test/registered/distributed/test_disaggregation_dsv4.py b/test/registered/disaggregation/test_disaggregation_dsv4.py
similarity index 100%
rename from test/registered/distributed/test_disaggregation_dsv4.py
rename to test/registered/disaggregation/test_disaggregation_dsv4.py
diff --git a/test/registered/distributed/test_disaggregation_hybrid_attention.py b/test/registered/disaggregation/test_disaggregation_hybrid_attention.py
similarity index 100%
rename from test/registered/distributed/test_disaggregation_hybrid_attention.py
rename to test/registered/disaggregation/test_disaggregation_hybrid_attention.py
diff --git a/test/registered/distributed/test_disaggregation_pp.py b/test/registered/disaggregation/test_disaggregation_pp.py
similarity index 100%
rename from test/registered/distributed/test_disaggregation_pp.py
rename to test/registered/disaggregation/test_disaggregation_pp.py
diff --git a/test/registered/distributed/test_epd_disaggregation.py b/test/registered/disaggregation/test_epd_disaggregation.py
similarity index 100%
rename from test/registered/distributed/test_epd_disaggregation.py
rename to test/registered/disaggregation/test_epd_disaggregation.py
diff --git a/test/registered/distributed/test_dp_attention.py b/test/registered/dp_attn/test_dp_attention.py
similarity index 100%
rename from test/registered/distributed/test_dp_attention.py
rename to test/registered/dp_attn/test_dp_attention.py
diff --git a/test/registered/distributed/test_data_parallelism.py b/test/registered/dp_engine/test_data_parallelism.py
similarity index 100%
rename from test/registered/distributed/test_data_parallelism.py
rename to test/registered/dp_engine/test_data_parallelism.py
diff --git a/test/registered/distributed/test_load_weights_from_remote_instance.py b/test/registered/model_loading/test_load_weights_from_remote_instance.py
similarity index 100%
rename from test/registered/distributed/test_load_weights_from_remote_instance.py
rename to test/registered/model_loading/test_load_weights_from_remote_instance.py
diff --git a/test/registered/distributed/test_load_weights_from_remote_instance_npu.py b/test/registered/model_loading/test_load_weights_from_remote_instance_npu.py
similarity index 100%
rename from test/registered/distributed/test_load_weights_from_remote_instance_npu.py
rename to test/registered/model_loading/test_load_weights_from_remote_instance_npu.py
diff --git a/test/registered/distributed/test_pp_single_node.py b/test/registered/pp/test_pp_single_node.py
similarity index 100%
rename from test/registered/distributed/test_pp_single_node.py
rename to test/registered/pp/test_pp_single_node.py
diff --git a/test/registered/distributed/test_parallel_state.py b/test/registered/unit/distributed/test_parallel_state.py
similarity index 100%
rename from test/registered/distributed/test_parallel_state.py
rename to test/registered/unit/distributed/test_parallel_state.py
diff --git a/test/srt/run_suite.py b/test/srt/run_suite.py
index 61b41e422..e45d361c3 100644
--- a/test/srt/run_suite.py
+++ b/test/srt/run_suite.py
@@ -37,7 +37,7 @@ suite_amd = {
         # TestFile("test_wave_attention_backend.py", 150), # Disabled temporarily, see https://github.com/sgl-project/sglang/issues/11127
         # The time estimation for `test_int4fp8_moe.py` assumes `mistralai/Mixtral-8x7B-Instruct-v0.1` is already cached (running on 1xMI300X).
     ],
-    # per-commit-4-gpu-amd migrated to test/registered/distributed/ using the CI registry system
+    # per-commit-4-gpu-amd migrated to test/registered/ using the CI registry system
     "per-commit-4-gpu-amd": [],
     # NOTE: AMD nightly suites (nightly-amd, nightly-amd-vlm, nightly-amd-8-gpu)
     # have been migrated to test/registered/amd/nightly/ and are now managed