diff --git a/.github/trigger_files/beam_PostCommit_Java_DataflowV1.json b/.github/trigger_files/beam_PostCommit_Java_DataflowV1.json
index ae6cb268ff68..0739b9bbf0b0 100644
--- a/.github/trigger_files/beam_PostCommit_Java_DataflowV1.json
+++ b/.github/trigger_files/beam_PostCommit_Java_DataflowV1.json
@@ -3,6 +3,6 @@
   "https://github.com/apache/beam/pull/34902": "Introducing OutputBuilder",
   "https://github.com/apache/beam/pull/35177": "Introducing WindowedValueReceiver to runners",
     "comment": "Modify this file in a trivial way to cause this test suite to run",
-    "modification": 9,
+    "modification": 10,
   "https://github.com/apache/beam/pull/35159": "moving WindowedValue and making an interface"
 }
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1.java
index 3f22e636e8ab..5fecd188cf9b 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreV1.java
@@ -1410,7 +1410,7 @@ private void emit(ProcessContext c, String dbRoot, StructuredQuery.Builder build
   }
 
   /** DoFn to output CollectionIds from a {@link ListCollectionIdsResponse}. */
-  private static final class FlattenListCollectionIdsResponse
+  static final class FlattenListCollectionIdsResponse
       extends DoFn<ListCollectionIdsResponse, String> {
     @ProcessElement
     public void processElement(ProcessContext c) {
@@ -1419,7 +1419,7 @@ public void processElement(ProcessContext c) {
   }
 
   /** DoFn to output {@link Document}s from a {@link ListDocumentsResponse}. */
-  private static final class ListDocumentsResponseToDocument
+  static final class ListDocumentsResponseToDocument
       extends DoFn<ListDocumentsResponse, Document> {
     @ProcessElement
     public void processElement(ProcessContext c) {
@@ -1826,7 +1826,7 @@ public List<WriteFailure> getWriteFailures() {
    * @param <BldrT> The type of the type safe builder which is used to build and instance of {@link
    *     TrfmT}
    */
-  private abstract static class Transform<
+  public abstract static class Transform<
           InT extends PInput,
           OutT extends POutput,
           TrfmT extends Transform<InT, OutT, TrfmT, BldrT>,
@@ -1880,7 +1880,7 @@ public final void populateDisplayData(DisplayData.Builder builder) {
      * @param <BldrT> The type of the type safe builder which is used to build and instance of
      *     {@link TrfmT}
      */
-    abstract static class Builder<
+    public abstract static class Builder<
         InT extends PInput,
         OutT extends POutput,
         TrfmT extends Transform<InT, OutT, TrfmT, BldrT>,
@@ -2018,7 +2018,7 @@ String getDatabaseId() {
     }
   }
 
-  private abstract static class ReadTransform<
+  public abstract static class ReadTransform<
           InT extends PInput,
           OutT extends POutput,
           TrfmT extends ReadTransform<InT, OutT, TrfmT, BldrT>,
@@ -2041,7 +2041,7 @@ private abstract static class ReadTransform<
     @Override
     public abstract BldrT toBuilder();
 
-    abstract static class Builder<
+    public abstract static class Builder<
             InT extends PInput,
             OutT extends POutput,
             TrfmT extends ReadTransform<InT, OutT, TrfmT, BldrT>,