diff --git a/tests/sdk/conftest.py b/tests/sdk/conftest.py
index 719c0ea4..36317fb4 100644
--- a/tests/sdk/conftest.py
+++ b/tests/sdk/conftest.py
@@ -38,8 +38,11 @@ def client(server):
     server_url = server
     print("Running client tests with server:", server_url)
 
+    # Overide the base_url if the LETTA_API_URL is set
+    api_url = os.getenv("LETTA_API_URL")
+    base_url = api_url if api_url else server_url
     # create the Letta client
-    yield Letta(base_url=server_url, token=None)
+    yield Letta(base_url=base_url, token=None)
 
 
 def skip_test_if_not_implemented(handler, resource_name, test_name):
diff --git a/tests/test_client.py b/tests/test_client.py
index e8ef64f3..8384f10f 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -36,6 +36,7 @@ def run_server():
 )
 def client(request):
     # Get URL from environment or start server
+    api_url = os.getenv("LETTA_API_URL")
     server_url = os.getenv("LETTA_SERVER_URL", f"http://localhost:{SERVER_PORT}")
     if not os.getenv("LETTA_SERVER_URL"):
         print("Starting server thread")
@@ -44,8 +45,10 @@ def client(request):
         wait_for_server(server_url)
     print("Running client tests with server:", server_url)
 
+    # Overide the base_url if the LETTA_API_URL is set
+    base_url = api_url if api_url else server_url
     # create the Letta client
-    yield Letta(base_url=server_url, token=None)
+    yield Letta(base_url=base_url, token=None)
 
 
 # Fixture for test agent
diff --git a/tests/test_streaming.py b/tests/test_streaming.py
index 016bac3d..d9a7a7f1 100644
--- a/tests/test_streaming.py
+++ b/tests/test_streaming.py
@@ -23,6 +23,7 @@ def run_server():
 )
 def client(request):
     # Get URL from environment or start server
+    api_url = os.getenv("LETTA_API_URL")
     server_url = os.getenv("LETTA_SERVER_URL", f"http://localhost:8283")
     if not os.getenv("LETTA_SERVER_URL"):
         print("Starting server thread")
@@ -31,8 +32,10 @@ def client(request):
         time.sleep(5)
     print("Running client tests with server:", server_url)
 
+    # Overide the base_url if the LETTA_API_URL is set
+    base_url = api_url if api_url else server_url
     # create the Letta client
-    yield Letta(base_url=server_url, token=None)
+    yield Letta(base_url=base_url, token=None)
 
 
 # Fixture for test agent