diff --git a/src/main/resources/com/google/api/codegen/py/transport.snip b/src/main/resources/com/google/api/codegen/py/transport.snip
index fbb1b92966..d9bf302264 100644
--- a/src/main/resources/com/google/api/codegen/py/transport.snip
+++ b/src/main/resources/com/google/api/codegen/py/transport.snip
@@ -53,7 +53,7 @@
                     options={
                         'grpc.max_send_message_length': -1,
                         'grpc.max_receive_message_length': -1,
-                    },
+                    }.items(),
                 )
 
             self._channel = channel
diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_library.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_library.baseline
index ce5d54d9cc..1d6a8d1167 100644
--- a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_library.baseline
+++ b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_library.baseline
@@ -4279,7 +4279,7 @@ class LibraryServiceGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
@@ -4783,7 +4783,7 @@ class MyProtoGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_multiple_services.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_multiple_services.baseline
index 7b72dedaba..26065f3ba7 100644
--- a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_multiple_services.baseline
+++ b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_multiple_services.baseline
@@ -1432,7 +1432,7 @@ class DecrementerServiceGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
@@ -1560,7 +1560,7 @@ class IncrementerServiceGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_no_path_templates.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_no_path_templates.baseline
index 8e9d2520a6..3874570deb 100644
--- a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_no_path_templates.baseline
+++ b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_no_path_templates.baseline
@@ -1121,7 +1121,7 @@ class NoTemplatesApiServiceGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_samplegen_config_migration_library.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_samplegen_config_migration_library.baseline
index 28b8d5a6b1..e5621a8b85 100644
--- a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_samplegen_config_migration_library.baseline
+++ b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_samplegen_config_migration_library.baseline
@@ -4270,7 +4270,7 @@ class LibraryServiceGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
@@ -4774,7 +4774,7 @@ class MyProtoGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library.baseline
index 4b7d97d9bc..0b9f4e7a77 100644
--- a/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library.baseline
+++ b/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library.baseline
@@ -4272,7 +4272,7 @@ class LibraryServiceGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
@@ -4776,7 +4776,7 @@ class MyProtoGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library_no_gapic_config.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library_no_gapic_config.baseline
index d4b53a23de..5ed4b87eb6 100644
--- a/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library_no_gapic_config.baseline
+++ b/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library_no_gapic_config.baseline
@@ -3781,7 +3781,7 @@ class LibraryServiceGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel
@@ -4280,7 +4280,7 @@ class MyProtoGrpcTransport(object):
                 options={
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
-                },
+                }.items(),
             )
 
         self._channel = channel