diff --git a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2 b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2
index ea09cad6a7..c5233c2703 100644
--- a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2
+++ b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2
@@ -175,7 +175,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
         """
         return self._transport
 
-    def __enter__(self):
+    def __enter__(self) -> "{{ service.client_name }}":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
index 2ae661bb49..bf6e34da7b 100644
--- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
+++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
@@ -379,7 +379,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
 {% endif %}
     {% endfor %}
 
-    def __enter__(self):
+    def __enter__(self) -> "{{ service.client_name }}":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py b/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py
index 8695e53c67..7aff28b059 100755
--- a/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py
+++ b/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py
@@ -1833,7 +1833,7 @@ def sample_analyze_iam_policy_longrunning():
         # Done; return the response.
         return response
 
-    def __enter__(self):
+    def __enter__(self) -> "AssetServiceClient":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py b/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py
index 91e8d7a9ae..1d9015f8c4 100755
--- a/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py
+++ b/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py
@@ -958,7 +958,7 @@ def sample_sign_jwt():
         # Done; return the response.
         return response
 
-    def __enter__(self):
+    def __enter__(self) -> "IAMCredentialsClient":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py b/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py
index 5d344f9721..bfb002a3c4 100755
--- a/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py
+++ b/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py
@@ -1034,7 +1034,7 @@ def sample_delete_trigger():
         # Done; return the response.
         return response
 
-    def __enter__(self):
+    def __enter__(self) -> "EventarcClient":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py
index ddb921837f..603e2caab7 100755
--- a/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py
+++ b/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py
@@ -2831,7 +2831,7 @@ def sample_update_cmek_settings():
         # Done; return the response.
         return response
 
-    def __enter__(self):
+    def __enter__(self) -> "ConfigServiceV2Client":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py
index 2047d73eb5..e55c65a053 100755
--- a/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py
+++ b/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py
@@ -1113,7 +1113,7 @@ def request_generator():
         # Done; return the response.
         return response
 
-    def __enter__(self):
+    def __enter__(self) -> "LoggingServiceV2Client":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py b/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py
index 8986dadb94..536fa09522 100755
--- a/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py
+++ b/tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/client.py
@@ -961,7 +961,7 @@ def sample_delete_log_metric():
             metadata=metadata,
         )
 
-    def __enter__(self):
+    def __enter__(self) -> "MetricsServiceV2Client":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py b/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py
index d2c77834e1..8b2f05fcd8 100755
--- a/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py
+++ b/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py
@@ -1596,7 +1596,7 @@ def sample_delete_instance():
         # Done; return the response.
         return response
 
-    def __enter__(self):
+    def __enter__(self) -> "CloudRedisClient":
         return self
 
     def __exit__(self, type, value, traceback):