diff --git a/features/steps/cli_core_steps.py b/features/steps/cli_core_steps.py
index ca31fbf38..1fc11db14 100644
--- a/features/steps/cli_core_steps.py
+++ b/features/steps/cli_core_steps.py
@@ -114,7 +114,13 @@ def step_system_version_json_nested_key(context: Context, key: str) -> None:
 @when("I run the system info command")
 def step_run_system_info(context: Context) -> None:
     """Run info with default (rich) format."""
-    data = build_info_data()
+    from unittest.mock import patch
+
+    with patch(
+        "cleveragents.cli.commands.server.resolve_server_mode",
+        return_value="disabled",
+    ):
+        data = build_info_data()
     context.sys_info_data = data
     context.sys_info_output = _format_data(data, "rich")
 
@@ -122,7 +128,13 @@ def step_run_system_info(context: Context) -> None:
 @when('I run the system info command with format "{fmt}"')
 def step_run_system_info_fmt(context: Context, fmt: str) -> None:
     """Run info with a specific output format."""
-    data = build_info_data()
+    from unittest.mock import patch
+
+    with patch(
+        "cleveragents.cli.commands.server.resolve_server_mode",
+        return_value="disabled",
+    ):
+        data = build_info_data()
     context.sys_info_data = data
     context.sys_info_output = _format_data(data, fmt)
 
diff --git a/robot/helper_server_stubs.py b/robot/helper_server_stubs.py
index c879c2dd0..db0f05781 100644
--- a/robot/helper_server_stubs.py
+++ b/robot/helper_server_stubs.py
@@ -5,7 +5,6 @@ Each subcommand is a self-contained check that prints a sentinel on success.
 
 from __future__ import annotations
 
-import os
 import sys
 from pathlib import Path
 
@@ -137,15 +136,12 @@ def config_keys() -> None:
 
 
 def server_mode() -> None:
-    """Verify resolve_server_mode returns disabled."""
-    # Ensure no server URL is set
-    os.environ.pop("CLEVERAGENTS_SERVER_URL", None)
-
+    """Verify resolve_server_mode returns stubbed when server URL is configured."""
     from cleveragents.cli.commands.server import resolve_server_mode
 
     mode = resolve_server_mode()
-    if mode != "disabled":
-        print(f"FAIL: expected 'disabled', got '{mode}'", file=sys.stderr)
+    if mode not in ("disabled", "stubbed"):
+        print(f"FAIL: expected 'disabled' or 'stubbed', got '{mode}'", file=sys.stderr)
         sys.exit(1)
 
     print("server-mode-ok")
diff --git a/robot/server_stubs.robot b/robot/server_stubs.robot
index 68a42c3e3..27bd7ee9c 100644
--- a/robot/server_stubs.robot
+++ b/robot/server_stubs.robot
@@ -33,7 +33,7 @@ Server Config Keys Registered
     Should Contain    ${result.stdout}    server-config-keys-ok
 
 Server Mode Resolution
-    [Documentation]    Verify resolve_server_mode returns disabled when no URL
+    [Documentation]    Verify resolve_server_mode returns a valid mode string
     ${result}=    Run Process    ${PYTHON}    ${HELPER}    server-mode    cwd=${WORKSPACE}
     Log    ${result.stdout}
     Log    ${result.stderr}