diff --git a/.buildkite/scripts/hardware_ci/run-amd-test.sh b/.buildkite/scripts/hardware_ci/run-amd-test.sh
index f6b9f514c..4cacc2710 100755
--- a/.buildkite/scripts/hardware_ci/run-amd-test.sh
+++ b/.buildkite/scripts/hardware_ci/run-amd-test.sh
@@ -337,12 +337,16 @@ apply_rocm_test_overrides() {
     --ignore=entrypoints/openai/completion/test_shutdown.py \
     --ignore=entrypoints/openai/test_completion.py \
     --ignore=entrypoints/openai/models/test_models.py \
-    --ignore=entrypoints/openai/test_lora_adapters.py \
     --ignore=entrypoints/openai/test_return_tokens_as_ids.py \
     --ignore=entrypoints/openai/chat_completion/test_root_path.py \
     --ignore=entrypoints/openai/completion/test_prompt_validation.py "}
   fi
 
+  if [[ $cmds == *" entrypoints/serve"* ]]; then
+    cmds="${cmds} \
+    --ignore=entrypoints/serve/lora/test_lora_adapters.py"
+  fi
+
   if [[ $cmds == *" entrypoints/llm "* ]]; then
     cmds=${cmds//" entrypoints/llm "/" entrypoints/llm \
     --ignore=entrypoints/llm/test_chat.py \
diff --git a/tests/entrypoints/openai/test_protocol.py b/tests/entrypoints/openai/responses/test_protocol.py
similarity index 100%
rename from tests/entrypoints/openai/test_protocol.py
rename to tests/entrypoints/openai/responses/test_protocol.py
diff --git a/tests/entrypoints/test_responses_utils.py b/tests/entrypoints/openai/responses/test_responses_utils.py
similarity index 100%
rename from tests/entrypoints/test_responses_utils.py
rename to tests/entrypoints/openai/responses/test_responses_utils.py
diff --git a/tests/entrypoints/serve/disagg/__init__.py b/tests/entrypoints/serve/disagg/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/entrypoints/openai/test_serving_tokens.py b/tests/entrypoints/serve/disagg/test_serving_tokens.py
similarity index 99%
rename from tests/entrypoints/openai/test_serving_tokens.py
rename to tests/entrypoints/serve/disagg/test_serving_tokens.py
index 6cd4fd7a1..b62cb01bb 100644
--- a/tests/entrypoints/openai/test_serving_tokens.py
+++ b/tests/entrypoints/serve/disagg/test_serving_tokens.py
@@ -8,12 +8,11 @@ import pytest
 import pytest_asyncio
 from transformers import AutoTokenizer
 
+from tests.utils import RemoteOpenAIServer
 from vllm.config import ModelConfig
 from vllm.config.utils import getattr_iter
 from vllm.v1.engine.detokenizer import check_stop_strings
 
-from ...utils import RemoteOpenAIServer
-
 MODEL_NAME = "Qwen/Qwen3-0.6B"
 GEN_ENDPOINT = "/inference/v1/generate"
 
diff --git a/tests/entrypoints/serve/lora/__init__.py b/tests/entrypoints/serve/lora/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/entrypoints/openai/test_lora_adapters.py b/tests/entrypoints/serve/lora/test_lora_adapters.py
similarity index 99%
rename from tests/entrypoints/openai/test_lora_adapters.py
rename to tests/entrypoints/serve/lora/test_lora_adapters.py
index d5aa730dd..a22f0b389 100644
--- a/tests/entrypoints/openai/test_lora_adapters.py
+++ b/tests/entrypoints/serve/lora/test_lora_adapters.py
@@ -10,7 +10,7 @@ import openai  # use the official client for correctness check
 import pytest
 import pytest_asyncio
 
-from ...utils import RemoteOpenAIServer
+from tests.utils import RemoteOpenAIServer
 
 # any model with a chat template should work here
 MODEL_NAME = "Qwen/Qwen3-0.6B"
diff --git a/tests/entrypoints/openai/test_serving_models.py b/tests/entrypoints/serve/lora/test_serving_models.py
similarity index 100%
rename from tests/entrypoints/openai/test_serving_models.py
rename to tests/entrypoints/serve/lora/test_serving_models.py
diff --git a/tests/entrypoints/serve/render/__init__.py b/tests/entrypoints/serve/render/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/entrypoints/openai/test_launch_render.py b/tests/entrypoints/serve/render/test_launch_render.py
similarity index 99%
rename from tests/entrypoints/openai/test_launch_render.py
rename to tests/entrypoints/serve/render/test_launch_render.py
index 12e95e219..37859e01f 100644
--- a/tests/entrypoints/openai/test_launch_render.py
+++ b/tests/entrypoints/serve/render/test_launch_render.py
@@ -6,7 +6,7 @@ import httpx
 import pytest
 import pytest_asyncio
 
-from ...utils import RemoteLaunchRenderServer
+from tests.utils import RemoteLaunchRenderServer
 
 MODEL_NAME = "hmellor/tiny-random-LlamaForCausalLM"
 
diff --git a/tests/entrypoints/openai/test_embedding_shape_validation.py b/tests/multimodal/test_embedding_shape_validation.py
similarity index 100%
rename from tests/entrypoints/openai/test_embedding_shape_validation.py
rename to tests/multimodal/test_embedding_shape_validation.py