diff --git a/tests/client-sdk/agents/test_agents.py b/tests/client-sdk/agents/test_agents.py
index 6fe0678b4..f1da4e124 100644
--- a/tests/client-sdk/agents/test_agents.py
+++ b/tests/client-sdk/agents/test_agents.py
@@ -212,7 +212,10 @@ def test_builtin_tool_code_execution(llama_stack_client, agent_config):
     assert "Tool:code_interpreter Response" in logs_str
 
 
-def test_code_execution(llama_stack_client, agent_config):
+# This test must be run in an environment where `bwrap` is available. If you are running against a
+# server, this means the _server_ must have `bwrap` available. If you are using library client, then
+# you must have `bwrap` available in test's environment.
+def test_code_interpreter_for_attachments(llama_stack_client, agent_config):
     agent_config = {
         **agent_config,
         "toolgroups": [
diff --git a/tests/client-sdk/metadata.py b/tests/client-sdk/metadata.py
index d8d6616c2..1a87c6bd0 100644
--- a/tests/client-sdk/metadata.py
+++ b/tests/client-sdk/metadata.py
@@ -38,7 +38,7 @@ AGENTS_API_TEST_MAP = {
     "create_agent_turn": {
         "rag": ["test_rag_agent"],
         "custom_tool": ["test_custom_tool"],
-        "code_execution": ["test_code_execution"],
+        "code_execution": ["test_code_interpreter_for_attachments"],
     }
 }