diff --git a/sdks/python/apache_beam/yaml/tests/assign_timestamps.yaml b/sdks/python/apache_beam/yaml/extended_tests/assign_timestamps.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/assign_timestamps.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/assign_timestamps.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/create.yaml b/sdks/python/apache_beam/yaml/extended_tests/create.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/create.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/create.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/extract_windowing_Info.yaml b/sdks/python/apache_beam/yaml/extended_tests/extract_windowing_Info.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/extract_windowing_Info.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/extract_windowing_Info.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/filter.yaml b/sdks/python/apache_beam/yaml/extended_tests/filter.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/filter.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/filter.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/flatten.yaml b/sdks/python/apache_beam/yaml/extended_tests/flatten.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/flatten.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/flatten.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/jdbc.yaml b/sdks/python/apache_beam/yaml/extended_tests/jdbc.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/jdbc.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/jdbc.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/kafka.yaml b/sdks/python/apache_beam/yaml/extended_tests/kafka.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/kafka.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/kafka.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/ml_transform.yaml b/sdks/python/apache_beam/yaml/extended_tests/ml_transform.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/ml_transform.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/ml_transform.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/mysql.yaml b/sdks/python/apache_beam/yaml/extended_tests/mysql.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/mysql.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/mysql.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/oracle.yaml b/sdks/python/apache_beam/yaml/extended_tests/oracle.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/oracle.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/oracle.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/partition.yaml b/sdks/python/apache_beam/yaml/extended_tests/partition.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/partition.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/partition.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/postgres.yaml b/sdks/python/apache_beam/yaml/extended_tests/postgres.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/postgres.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/postgres.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/pubsub.yaml b/sdks/python/apache_beam/yaml/extended_tests/pubsub.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/pubsub.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/pubsub.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/pytransform.yaml b/sdks/python/apache_beam/yaml/extended_tests/pytransform.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/pytransform.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/pytransform.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/runinference.yaml b/sdks/python/apache_beam/yaml/extended_tests/runinference.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/runinference.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/runinference.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/sqlserver.yaml b/sdks/python/apache_beam/yaml/extended_tests/sqlserver.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/sqlserver.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/sqlserver.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/tfrecord.yaml b/sdks/python/apache_beam/yaml/extended_tests/tfrecord.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/tfrecord.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/tfrecord.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/validate_with_schema.yaml b/sdks/python/apache_beam/yaml/extended_tests/validate_with_schema.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/validate_with_schema.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/validate_with_schema.yaml
diff --git a/sdks/python/apache_beam/yaml/tests/windowinto.yaml b/sdks/python/apache_beam/yaml/extended_tests/windowinto.yaml
similarity index 100%
rename from sdks/python/apache_beam/yaml/tests/windowinto.yaml
rename to sdks/python/apache_beam/yaml/extended_tests/windowinto.yaml