diff --git a/google-cloud-firestore/clirr-ignored-differences.xml b/google-cloud-firestore/clirr-ignored-differences.xml
index f8d2661ea..565a807b6 100644
--- a/google-cloud-firestore/clirr-ignored-differences.xml
+++ b/google-cloud-firestore/clirr-ignored-differences.xml
@@ -162,4 +162,14 @@
     <to>com.google.cloud.firestore.CollectionGroup</to>
   </difference>
 
+  <!--
+  FakeCredentials Refactor
+  com.google.cloud.firestore.FirestoreOptions$Builder$FakeCredentials -> com.google.cloud.firestore.FirestoreOptions$EmulatorCredentials
+  -->
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/firestore/FirestoreOptions$Builder$FakeCredentials</className>
+    <to>*</to>
+  </difference>
+
 </differences>
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java
index c4f076c67..c8ad757b9 100644
--- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java
+++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java
@@ -226,39 +226,39 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder input) {
                 .build());
         // Use a `CredentialProvider` to match the Firebase Admin SDK, which prevents the Admin SDK
         // from overwriting the Emulator credentials.
-        this.setCredentialsProvider(FixedCredentialsProvider.create(new FakeCredentials()));
+        this.setCredentialsProvider(FixedCredentialsProvider.create(new EmulatorCredentials()));
       }
 
       return new FirestoreOptions(this);
     }
+  }
 
-    public class FakeCredentials extends Credentials {
-      private final Map<String, List<String>> HEADERS =
-          ImmutableMap.of("Authorization", Arrays.asList("Bearer owner"));
-
-      @Override
-      public String getAuthenticationType() {
-        throw new IllegalArgumentException("Not supported");
-      }
+  public static class EmulatorCredentials extends Credentials {
+    private final Map<String, List<String>> HEADERS =
+        ImmutableMap.of("Authorization", Arrays.asList("Bearer owner"));
 
-      @Override
-      public Map<String, List<String>> getRequestMetadata(URI uri) {
-        return HEADERS;
-      }
+    @Override
+    public String getAuthenticationType() {
+      throw new IllegalArgumentException("Not supported");
+    }
 
-      @Override
-      public boolean hasRequestMetadata() {
-        return true;
-      }
+    @Override
+    public Map<String, List<String>> getRequestMetadata(URI uri) {
+      return HEADERS;
+    }
 
-      @Override
-      public boolean hasRequestMetadataOnly() {
-        return true;
-      }
+    @Override
+    public boolean hasRequestMetadata() {
+      return true;
+    }
 
-      @Override
-      public void refresh() {}
+    @Override
+    public boolean hasRequestMetadataOnly() {
+      return true;
     }
+
+    @Override
+    public void refresh() {}
   }
 
   @InternalApi("This class should only be extended within google-cloud-java")