diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4ca9dc19d450..ba31e7647372 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -135,6 +135,7 @@
 /tensorrt_llm/serve @NVIDIA/trt-llm-runtime-devs
 /tensorrt_llm/tokenizer @NVIDIA/trt-llm-runtime-devs
 /tensorrt_llm/usage @NVIDIA/trt-llm-runtime-devs
+/tests/test_common/serve @NVIDIA/trt-llm-runtime-devs
 /tests/torch @NVIDIA/trt-llm-runtime-devs
 /tests/unittest/_torch/compilation @NVIDIA/trt-llm-runtime-devs
 # Matches nothing today -- PR #17968 moved these tests out -- but kept so a recreated custom_ops/ lands here instead of on the global fallback.
@@ -155,6 +156,7 @@
 /tests/unittest/llmapi @NVIDIA/trt-llm-runtime-devs
 /tests/unittest/llmapi/apps/*multimodal* @NVIDIA/trt-llm-runtime-devs @NVIDIA/trt-llm-models-devs
 /tests/unittest/pyexecutor @NVIDIA/trt-llm-runtime-devs
+/tests/unittest/serve @NVIDIA/trt-llm-runtime-devs
 
 # ===== KERNELS - MISC =====
 /cpp/include/tensorrt_llm/deep_gemm @NVIDIA/trt-llm-kernels-devs
@@ -377,6 +379,7 @@
 /tests/integration/defs/visual_gen @NVIDIA/trt-llm-torch-visual-gen-devs
 /tests/scripts/perf-sanity/visual_gen @NVIDIA/trt-llm-torch-visual-gen-devs
 /tests/unittest/_torch/visual_gen @NVIDIA/trt-llm-torch-visual-gen-devs
+/tests/unittest/serve/api/visual_gen @NVIDIA/trt-llm-torch-visual-gen-devs
 /tests/unittest/visual_gen @NVIDIA/trt-llm-torch-visual-gen-devs
 
 # ===== SCAFFOLDING =====