diff --git a/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py b/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py
index 92de8e17..40e0f51d 100644
--- a/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py
+++ b/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py
@@ -612,7 +612,7 @@ async def sample_split_read_stream():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "BigQueryReadAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py b/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py
index 2ecf4140..4cef5aef 100644
--- a/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py
+++ b/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py
@@ -946,7 +946,7 @@ async def sample_flush_rows():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "BigQueryWriteAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py b/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py
index 4c07098b..83c1bd97 100644
--- a/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py
+++ b/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py
@@ -615,7 +615,7 @@ async def sample_split_read_stream():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "BigQueryReadAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py b/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py
index ef4f649a..d584ecb8 100644
--- a/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py
+++ b/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py
@@ -918,7 +918,7 @@ async def sample_flush_rows():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "BigQueryWriteAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py b/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py
index 686530b3..1a4edbbd 100644
--- a/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py
+++ b/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py
@@ -705,7 +705,6 @@ def test_create_read_session(request_type, transport: str = "grpc"):
             estimated_total_physical_file_size=3608,
             estimated_row_count=2047,
             trace_id="trace_id_value",
-            avro_schema=avro.AvroSchema(schema="schema_value"),
         )
         response = client.create_read_session(request)
 
diff --git a/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py b/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py
index 00e5d2b5..66f286f5 100644
--- a/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py
+++ b/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py
@@ -703,7 +703,6 @@ def test_create_read_session(request_type, transport: str = "grpc"):
             name="name_value",
             data_format=stream.DataFormat.AVRO,
             table="table_value",
-            avro_schema=avro.AvroSchema(schema="schema_value"),
         )
         response = client.create_read_session(request)