diff --git a/test/registered/cuda_graph/piecewise/test_pcg_glm52_fp4.py b/test/registered/cuda_graph/piecewise/test_pcg_glm52_fp4.py
index 66522bc2c..41a978113 100644
--- a/test/registered/cuda_graph/piecewise/test_pcg_glm52_fp4.py
+++ b/test/registered/cuda_graph/piecewise/test_pcg_glm52_fp4.py
@@ -11,7 +11,7 @@ from sglang.test.test_utils import (
     popen_launch_server,
 )
 
-register_cuda_ci(est_time=900, stage="base-c", runner_config="4-gpu-b200")
+register_cuda_ci(est_time=900, suite="nightly-4-gpu-b200", nightly=True)
 
 GLM52_FP4_MODEL = "nvidia/GLM-5.2-NVFP4"
 
diff --git a/test/registered/cuda_graph/piecewise/test_pcg_glm52_fp8_tp8.py b/test/registered/cuda_graph/piecewise/test_pcg_glm52_fp8_tp8.py
index 9a84bac9d..3c26bb842 100644
--- a/test/registered/cuda_graph/piecewise/test_pcg_glm52_fp8_tp8.py
+++ b/test/registered/cuda_graph/piecewise/test_pcg_glm52_fp8_tp8.py
@@ -11,7 +11,7 @@ from sglang.test.test_utils import (
     popen_launch_server,
 )
 
-register_cuda_ci(est_time=900, stage="base-c", runner_config="8-gpu-h200")
+register_cuda_ci(est_time=900, suite="nightly-8-gpu-h200", nightly=True)
 
 GLM52_FP8_MODEL = "zai-org/GLM-5.2-FP8"
 
diff --git a/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding.py b/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding.py
index 9381defb5..0864131d7 100644
--- a/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding.py
+++ b/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding.py
@@ -11,7 +11,7 @@ import unittest
 from sglang.test.ci.ci_register import register_cuda_ci
 from sglang.test.server_fixtures.pcg_spec_fixture import PCGSpecBase
 
-register_cuda_ci(est_time=531, stage="base-b", runner_config="2-gpu-large")
+register_cuda_ci(est_time=531, suite="nightly-4-gpu", nightly=True)
 
 
 class TestPCGWithEAGLE3(PCGSpecBase, unittest.TestCase):
diff --git a/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding_dflash.py b/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding_dflash.py
index cc33a7aa0..18dea0c49 100644
--- a/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding_dflash.py
+++ b/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding_dflash.py
@@ -15,7 +15,7 @@ from sglang.test.test_utils import (
     CustomTestCase,
 )
 
-register_cuda_ci(est_time=531, stage="base-b", runner_config="1-gpu-small")
+register_cuda_ci(est_time=531, suite="nightly-1-gpu", nightly=True)
 
 
 class TestPCGWithDFlash(PCGSpecBase, CustomTestCase):
diff --git a/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding_extra.py b/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding_extra.py
index 80425012d..cf5b1b64a 100644
--- a/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding_extra.py
+++ b/test/registered/cuda_graph/piecewise/test_pcg_with_speculative_decoding_extra.py
@@ -1,7 +1,6 @@
 """Extra: PCG coexistence with non-EAGLE3 speculative decoding variants.
 
-EAGLE3 stays per-commit in the sibling file
-test_pcg_with_speculative_decoding.py.
+EAGLE3 lives in the sibling file test_pcg_with_speculative_decoding.py.
 """
 
 import unittest
@@ -9,7 +8,7 @@ import unittest
 from sglang.test.ci.ci_register import register_cuda_ci
 from sglang.test.server_fixtures.pcg_spec_fixture import PCGSpecBase
 
-register_cuda_ci(est_time=531, stage="extra-a", runner_config="2-gpu-large")
+register_cuda_ci(est_time=531, suite="nightly-4-gpu", nightly=True)
 
 
 class TestPCGWithMTP(PCGSpecBase, unittest.TestCase):
diff --git a/test/registered/cuda_graph/piecewise/test_piecewise_cuda_graph_support_1_gpu.py b/test/registered/cuda_graph/piecewise/test_piecewise_cuda_graph_support_1_gpu.py
index cfd22c857..cd7ca1ae7 100644
--- a/test/registered/cuda_graph/piecewise/test_piecewise_cuda_graph_support_1_gpu.py
+++ b/test/registered/cuda_graph/piecewise/test_piecewise_cuda_graph_support_1_gpu.py
@@ -17,7 +17,7 @@ from sglang.test.test_utils import (
 )
 
 # CI Registration
-register_cuda_ci(est_time=180, stage="base-b", runner_config="1-gpu-large")
+register_cuda_ci(est_time=180, suite="nightly-1-gpu", nightly=True)
 register_amd_ci(est_time=180, suite="stage-b-test-1-gpu-large-amd")
 
 
diff --git a/test/registered/prefill_only/test_fa_skip_kv_cache_piecewise_nan.py b/test/registered/prefill_only/test_fa_skip_kv_cache_piecewise_nan.py
index 9dcb63cf8..e51027b5b 100644
--- a/test/registered/prefill_only/test_fa_skip_kv_cache_piecewise_nan.py
+++ b/test/registered/prefill_only/test_fa_skip_kv_cache_piecewise_nan.py
@@ -38,11 +38,11 @@ from sglang.srt.utils import get_device_sm
 from sglang.test.ci.ci_register import register_cuda_ci
 from sglang.test.test_utils import CustomTestCase
 
-# Route to the H100 runner (1-gpu-large, SM90) -- NOT 1-gpu-small, which is an
-# RTX 5090 (SM120/Blackwell) where FA3 does not exist. FA3 + the piecewise embedding
-# path this regression covers only runs on Ampere/Ada/Hopper (SM 80-90), so the test
-# must land on the H100 pool to actually execute (on 1-gpu-small it would skip 100%).
-register_cuda_ci(est_time=600, stage="base-b", runner_config="1-gpu-large")
+# Route to the nightly 1-GPU suite, which runs on the H100 pool (1-gpu-h100, SM90).
+# FA3 + the piecewise embedding path this regression covers only runs on
+# Ampere/Ada/Hopper (SM 80-90), so the test must land on the H100 pool to actually
+# execute (on the RTX 5090 SM120/Blackwell 1-gpu-small runner it would skip 100%).
+register_cuda_ci(est_time=600, suite="nightly-1-gpu", nightly=True)
 
 # Lowest/highest CUDA SM that supports the FA3 + piecewise embedding path. FA3 is
 # unavailable on Blackwell (sm100 B200 / sm120 consumer e.g. RTX 5090); the gate is