diff --git a/.github/trigger_files/beam_PostCommit_Yaml_Xlang_Direct.json b/.github/trigger_files/beam_PostCommit_Yaml_Xlang_Direct.json
index a975cd1cd104..541dc4ea8e87 100644
--- a/.github/trigger_files/beam_PostCommit_Yaml_Xlang_Direct.json
+++ b/.github/trigger_files/beam_PostCommit_Yaml_Xlang_Direct.json
@@ -1,4 +1,4 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "revision": 1
+  "revision": 2
 }
diff --git a/.github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json b/.github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json
index 8c604b0a135c..840d064bdbb0 100644
--- a/.github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json
+++ b/.github/trigger_files/beam_PreCommit_Yaml_Xlang_Direct.json
@@ -1,4 +1,4 @@
 {
     "comment": "Modify this file in a trivial way to cause this test suite to run",
-    "revision": 2
+    "revision": 3
 }
diff --git a/sdks/python/apache_beam/yaml/extended_tests/e2e/gcs_avro_to_cloud_bigtable.yaml b/sdks/python/apache_beam/yaml/extended_tests/e2e/gcs_avro_to_cloud_bigtable.yaml
index e492e697af3a..86c1a4660613 100644
--- a/sdks/python/apache_beam/yaml/extended_tests/e2e/gcs_avro_to_cloud_bigtable.yaml
+++ b/sdks/python/apache_beam/yaml/extended_tests/e2e/gcs_avro_to_cloud_bigtable.yaml
@@ -64,7 +64,7 @@ pipelines:
               key:
                 callable: |
                   def convert_to_bytes(row):
-                    return bytes(row.key, 'utf-8') if "key" in row._fields else None
+                    return bytes(row.key, 'utf-8') if hasattr(row, "key") else None
               type:
                 type
               family_name:
@@ -72,11 +72,11 @@ pipelines:
               column_qualifier:
                 callable: |
                   def convert_to_bytes(row):
-                    return bytes(row.column_qualifier, 'utf-8') if 'column_qualifier' in row._fields else None
+                    return bytes(row.column_qualifier, 'utf-8') if hasattr(row, 'column_qualifier') else None
               value:
                 callable: |
                   def convert_to_bytes(row):
-                    return bytes(row.value, 'utf-8') if 'value' in row._fields else None
+                    return bytes(row.value, 'utf-8') if hasattr(row, 'value') else None
               timestamp_micros:
                 timestamp_micros
         - type: WriteToBigTable
@@ -102,13 +102,13 @@ pipelines:
               key:
                 callable: |
                   def convert_to_string(row):
-                    return row.key.decode("utf-8") if "key" in row._fields else None
+                    return row.key.decode("utf-8") if hasattr(row, "key") else None
               family_name:
                 family_name
               column_qualifier:
                 callable: |
                   def convert_to_string(row):
-                    return row.column_qualifier.decode("utf-8") if "column_qualifier" in row._fields else None
+                    return row.column_qualifier.decode("utf-8") if hasattr(row, "column_qualifier") else None
               cells:
                 callable: |
                   def convert_to_string(row):