diff --git a/.env_integration_tests.example b/.env_integration_tests.example
index 5d03496..9ecbe8e 100644
--- a/.env_integration_tests.example
+++ b/.env_integration_tests.example
@@ -34,8 +34,8 @@ CLOUD_SDK_CFG_ADMS_DEFAULT_URL=https://your-tenant.accounts.ondemand.com
 CLOUD_SDK_CFG_ADMS_DEFAULT_URI=https://your-adm-host.cfapps.eu20.hana.ondemand.com
 CLOUD_SDK_CFG_ADMS_DEFAULT_RESOURCE=urn:sap:identity:application:provider:name:your-adm-app-name
 
-APPFND_CONHOS_LANDSCAPE=your-landscape-here
-TENANT_SUBDOMAIN=your-tenant-subdomain-here
+CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN=your-tenant-subdomain-here
+CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE=your-landscape-here
 AGW_USER_TOKEN=your-user-jwt-here
 
 # AI Core — required for Traceloop/LangGraph integration tests
diff --git a/tests/agentgateway/integration/conftest.py b/tests/agentgateway/integration/conftest.py
index aa96899..9039096 100644
--- a/tests/agentgateway/integration/conftest.py
+++ b/tests/agentgateway/integration/conftest.py
@@ -21,9 +21,13 @@ def agw_client() -> AgentGatewayClient:
     """Create an AgentGatewayClient from environment variables."""
     _setup_cloud_mode()
 
-    tenant_subdomain = os.environ.get("TENANT_SUBDOMAIN")
+    tenant_subdomain = os.environ.get("CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN")
     if not tenant_subdomain:
-        pytest.fail("TENANT_SUBDOMAIN environment variable is not set")
+        pytest.fail("CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN environment variable is not set")
+
+    landscape = os.environ.get("CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE")
+    if landscape:
+        os.environ.setdefault("APPFND_CONHOS_LANDSCAPE", landscape)
 
     try:
         return create_client(tenant_subdomain=tenant_subdomain)
diff --git a/tests/agentgateway/integration/test_agw_bdd.py b/tests/agentgateway/integration/test_agw_bdd.py
index 0d6799d..46c84d0 100644
--- a/tests/agentgateway/integration/test_agw_bdd.py
+++ b/tests/agentgateway/integration/test_agw_bdd.py
@@ -2,8 +2,8 @@
 
 Run against a live BTP tenant:
 
-    APPFND_CONHOS_LANDSCAPE=<landscape> \\
-    TENANT_SUBDOMAIN=<tenant-subdomain> \\
+    CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN=<tenant-subdomain> \\
+    CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE=<landscape> \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_CLIENTID=... \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_CLIENTSECRET=... \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_URL=... \\