diff --git a/tests/app_net_csm_observability_test.py b/tests/app_net_csm_observability_test.py
index 51b8f98a..10426a3a 100644
--- a/tests/app_net_csm_observability_test.py
+++ b/tests/app_net_csm_observability_test.py
@@ -173,8 +173,7 @@ class AppNetCsmObservabilityTest(xds_k8s_testcase.AppNetXdsKubernetesTestCase):
 
     @staticmethod
     def is_supported(config: skips.TestConfig) -> bool:
-        if config.client_lang == _Lang.CPP and config.server_lang == _Lang.CPP:
-            # CSM Observability Test is only supported for CPP for now.
+        if config.client_lang == _Lang.CPP:
             return config.version_gte("v1.62.x")
         return False
 
diff --git a/tests/gamma/csm_observability_test.py b/tests/gamma/csm_observability_test.py
index 9cbbbb8e..d66fd586 100644
--- a/tests/gamma/csm_observability_test.py
+++ b/tests/gamma/csm_observability_test.py
@@ -101,7 +101,6 @@
 GammaServerRunner = gamma_server_runner.GammaServerRunner
 ClientDeploymentArgs = k8s_xds_client_runner.ClientDeploymentArgs
 KubernetesClientRunner = k8s_xds_client_runner.KubernetesClientRunner
-ServerDeploymentArgs = k8s_xds_server_runner.ServerDeploymentArgs
 BuildQueryFn = Callable[[str, str], str]
 ANY = unittest.mock.ANY
 
@@ -201,7 +200,7 @@ def initKubernetesClientRunner(self, **kwargs) -> KubernetesClientRunner:
     # each run().
     def initKubernetesServerRunner(self, **kwargs) -> GammaServerRunner:
         return super().initKubernetesServerRunner(
-            deployment_args=ServerDeploymentArgs(
+            deployment_args=gamma_server_runner.ServerDeploymentArgs(
                 enable_csm_observability=True,
                 csm_workload_name=CSM_WORKLOAD_NAME_SERVER,
                 csm_canonical_service_name=CSM_CANONICAL_SERVICE_NAME_SERVER,