basicmachines-co
diff --git a/‎src/basic_memory/api/app.py‎
Lines changed: 2 additions & 8 deletions b/‎src/basic_memory/api/app.py‎
Lines changed: 2 additions & 8 deletions
diff --git a/‎src/basic_memory/config.py‎
Lines changed: 17 additions & 0 deletions b/‎src/basic_memory/config.py‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎src/basic_memory/mcp/server.py‎
Lines changed: 1 addition & 7 deletions b/‎src/basic_memory/mcp/server.py‎
Lines changed: 1 addition & 7 deletions
diff --git a/‎src/basic_memory/services/initialization.py‎
Lines changed: 2 additions & 8 deletions b/‎src/basic_memory/services/initialization.py‎
Lines changed: 2 additions & 8 deletions
diff --git a/‎src/basic_memory/telemetry.py‎
Lines changed: 4 additions & 3 deletions b/‎src/basic_memory/telemetry.py‎
Lines changed: 4 additions & 3 deletions
@@ -1,7 +1,6 @@
 """FastAPI application for basic-memory knowledge graph API."""
 
 import asyncio
-import os
 from contextlib import asynccontextmanager
 
 from fastapi import FastAPI, HTTPException
@@ -55,12 +54,7 @@ async def lifespan(app: FastAPI):  # pragma: no cover
     logger.info("Database connections cached in app state")
 
     # Start file sync if enabled
-    is_test_env = (
-        app_config.env == "test"
-        or os.getenv("BASIC_MEMORY_ENV", "").lower() == "test"
-        or os.getenv("PYTEST_CURRENT_TEST") is not None
-    )
-    if app_config.sync_changes and not is_test_env:
+    if app_config.sync_changes and not app_config.is_test_env:
         logger.info(f"Sync changes enabled: {app_config.sync_changes}")
 
         # start file sync task in background
@@ -69,7 +63,7 @@ async def _file_sync_runner() -> None:
 
         app.state.sync_task = asyncio.create_task(_file_sync_runner())
     else:
-        if is_test_env:
+        if app_config.is_test_env:
             logger.info("Test environment detected. Skipping file sync service.")
         else:
             logger.info("Sync changes disabled. Skipping file sync service.")
 
@@ -232,6 +232,23 @@ class BasicMemoryConfig(BaseSettings):
         description="Whether the one-time telemetry notice has been shown to the user",
     )
 
+    @property
+    def is_test_env(self) -> bool:
+        """Check if running in a test environment.
+
+        Returns True if any of:
+        - env field is set to "test"
+        - BASIC_MEMORY_ENV environment variable is "test"
+        - PYTEST_CURRENT_TEST environment variable is set (pytest is running)
+
+        Used to disable features like telemetry and file watchers during tests.
+        """
+        return (
+            self.env == "test"
+            or os.getenv("BASIC_MEMORY_ENV", "").lower() == "test"
+            or os.getenv("PYTEST_CURRENT_TEST") is not None
+        )
+
     @property
     def cloud_mode_enabled(self) -> bool:
         """Check if cloud mode is enabled.
 
@@ -3,7 +3,6 @@
 """
 
 import asyncio
-import os
 from contextlib import asynccontextmanager
 
 from fastmcp import FastMCP
@@ -42,12 +41,7 @@ async def lifespan(app: FastMCP):
 
     # Start file sync as background task (if enabled and not in cloud mode)
     sync_task = None
-    is_test_env = (
-        app_config.env == "test"
-        or os.getenv("BASIC_MEMORY_ENV", "").lower() == "test"
-        or os.getenv("PYTEST_CURRENT_TEST") is not None
-    )
-    if is_test_env:
+    if app_config.is_test_env:
         logger.info("Test environment detected - skipping local file sync")
     elif app_config.sync_changes and not app_config.cloud_mode_enabled:
         logger.info("Starting file sync in background")
 
@@ -82,14 +82,8 @@ async def initialize_file_sync(
     """
     # Never start file watching during tests. Even "background" watchers add tasks/threads
     # and can interact badly with strict asyncio teardown (especially on Windows/aiosqlite).
-    #
-    # Note: Some tests patch ConfigManager.config with a minimal BasicMemoryConfig that
-    # may not set env="test". So also detect pytest via env vars.
-    if (
-        app_config.env == "test"
-        or os.getenv("BASIC_MEMORY_ENV", "").lower() == "test"
-        or os.getenv("PYTEST_CURRENT_TEST") is not None
-    ):
+    # Skip file sync in test environments to avoid interference with tests
+    if app_config.is_test_env:
         logger.info("Test environment detected - skipping file sync initialization")
         return None
 
 
@@ -90,15 +90,16 @@ def _get_client() -> OpenPanel:
 
         # Trigger: first call to track an event
         # Why: lazy init avoids work if telemetry never used; disabled flag
-        #      tells OpenPanel to skip network calls when user opts out
+        #      tells OpenPanel to skip network calls when user opts out or during tests
         # Outcome: client ready to queue events (or silently discard if disabled)
+        is_disabled = not config.telemetry_enabled or config.is_test_env
         _client = OpenPanel(
             client_id=OPENPANEL_CLIENT_ID,
             client_secret=OPENPANEL_CLIENT_SECRET,
-            disabled=not config.telemetry_enabled,
+            disabled=is_disabled,
         )
 
-        if config.telemetry_enabled and not _initialized:
+        if config.telemetry_enabled and not config.is_test_env and not _initialized:
             # Set global properties that go with every event
             _client.set_global_properties(
                 {