diff --git a/packages/cloud_firestore/cloud_firestore/test/mock.dart b/packages/cloud_firestore/cloud_firestore/test/mock.dart
index 71e0fde83765..c5d37b2cb1f7 100644
--- a/packages/cloud_firestore/cloud_firestore/test/mock.dart
+++ b/packages/cloud_firestore/cloud_firestore/test/mock.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/cloud_functions/cloud_functions/test/mock.dart b/packages/cloud_functions/cloud_functions/test/mock.dart
index aa9a67961ece..92be31b7f3b3 100644
--- a/packages/cloud_functions/cloud_functions/test/mock.dart
+++ b/packages/cloud_functions/cloud_functions/test/mock.dart
@@ -6,7 +6,7 @@
 import 'package:cloud_functions_platform_interface/cloud_functions_platform_interface.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/cloud_functions/cloud_functions_platform_interface/test/mock.dart b/packages/cloud_functions/cloud_functions_platform_interface/test/mock.dart
index f990f975a132..83797a12379c 100644
--- a/packages/cloud_functions/cloud_functions_platform_interface/test/mock.dart
+++ b/packages/cloud_functions/cloud_functions_platform_interface/test/mock.dart
@@ -5,7 +5,7 @@
 
 import 'package:cloud_functions_platform_interface/src/firebase_functions_exception.dart';
 import 'package:cloud_functions_platform_interface/src/method_channel/method_channel_firebase_functions.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_analytics/firebase_analytics/test/mock.dart b/packages/firebase_analytics/firebase_analytics/test/mock.dart
index 117f0cd5662f..fdb3309be03c 100644
--- a/packages/firebase_analytics/firebase_analytics/test/mock.dart
+++ b/packages/firebase_analytics/firebase_analytics/test/mock.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_analytics_platform_interface/firebase_analytics_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_analytics/firebase_analytics_platform_interface/test/mock.dart b/packages/firebase_analytics/firebase_analytics_platform_interface/test/mock.dart
index f63b0507d302..90541bbc9608 100644
--- a/packages/firebase_analytics/firebase_analytics_platform_interface/test/mock.dart
+++ b/packages/firebase_analytics/firebase_analytics_platform_interface/test/mock.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_analytics_platform_interface/firebase_analytics_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_app_check/firebase_app_check/test/mock.dart b/packages/firebase_app_check/firebase_app_check/test/mock.dart
index 2da26a89c239..d0f27a0c0a11 100644
--- a/packages/firebase_app_check/firebase_app_check/test/mock.dart
+++ b/packages/firebase_app_check/firebase_app_check/test/mock.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_app_check_platform_interface/firebase_app_check_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_app_check/firebase_app_check_platform_interface/test/mock.dart b/packages/firebase_app_check/firebase_app_check_platform_interface/test/mock.dart
index 9cefc319fe4c..c42da2c064bf 100644
--- a/packages/firebase_app_check/firebase_app_check_platform_interface/test/mock.dart
+++ b/packages/firebase_app_check/firebase_app_check_platform_interface/test/mock.dart
@@ -4,7 +4,7 @@
 
 import 'package:firebase_app_check_platform_interface/firebase_app_check_platform_interface.dart';
 import 'package:firebase_app_check_platform_interface/src/method_channel/method_channel_firebase_app_check.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_app_installations/firebase_app_installations/test/firebase_installations_test.dart b/packages/firebase_app_installations/firebase_app_installations/test/firebase_installations_test.dart
index 5440ae72ac6b..6c4c67b038db 100644
--- a/packages/firebase_app_installations/firebase_app_installations/test/firebase_installations_test.dart
+++ b/packages/firebase_app_installations/firebase_app_installations/test/firebase_installations_test.dart
@@ -6,7 +6,7 @@
 import 'package:firebase_app_installations/firebase_app_installations.dart';
 import 'package:firebase_app_installations_platform_interface/firebase_app_installations_platform_interface.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
diff --git a/packages/firebase_auth/firebase_auth/test/mock.dart b/packages/firebase_auth/firebase_auth/test/mock.dart
index 028d96c38558..f3a05c677c54 100644
--- a/packages/firebase_auth/firebase_auth/test/mock.dart
+++ b/packages/firebase_auth/firebase_auth/test/mock.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_auth/firebase_auth_platform_interface/test/mock.dart b/packages/firebase_auth/firebase_auth_platform_interface/test/mock.dart
index 99b0b6c123d3..143b504ed9a2 100644
--- a/packages/firebase_auth/firebase_auth_platform_interface/test/mock.dart
+++ b/packages/firebase_auth/firebase_auth_platform_interface/test/mock.dart
@@ -5,7 +5,7 @@
 import 'package:firebase_auth_platform_interface/firebase_auth_platform_interface.dart';
 import 'package:firebase_auth_platform_interface/src/method_channel/method_channel_firebase_auth.dart';
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml
index 53b7c7863ba6..218b8d9867c6 100644
--- a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml
+++ b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml
@@ -14,12 +14,11 @@ dependencies:
   collection: ^1.0.0
   flutter:
     sdk: flutter
-  # Needed to export the mocks
-  flutter_test:
-    sdk: flutter
   meta: ^1.8.0
   plugin_platform_interface: ^2.1.3
 
 dev_dependencies:
+  flutter_test:
+    sdk: flutter
   mockito: ^5.4.0
   pigeon: 9.2.5
diff --git a/packages/firebase_core/firebase_core_platform_interface/test/firebase_options_test.dart b/packages/firebase_core/firebase_core_platform_interface/test/firebase_options_test.dart
index 98a904060e39..e128fb455407 100644
--- a/packages/firebase_core/firebase_core_platform_interface/test/firebase_options_test.dart
+++ b/packages/firebase_core/firebase_core_platform_interface/test/firebase_options_test.dart
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import 'test.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/pigeon/mocks.dart b/packages/firebase_core/firebase_core_platform_interface/test/pigeon/mocks.dart
similarity index 96%
rename from packages/firebase_core/firebase_core_platform_interface/lib/src/pigeon/mocks.dart
rename to packages/firebase_core/firebase_core_platform_interface/test/pigeon/mocks.dart
index 13d7b3f8808e..97e5289ecc16 100644
--- a/packages/firebase_core/firebase_core_platform_interface/lib/src/pigeon/mocks.dart
+++ b/packages/firebase_core/firebase_core_platform_interface/test/pigeon/mocks.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../test.dart';
 
 class MockFirebaseApp implements TestFirebaseCoreHostApi {
   @override
diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/pigeon/test_api.dart b/packages/firebase_core/firebase_core_platform_interface/test/pigeon/test_api.dart
similarity index 66%
rename from packages/firebase_core/firebase_core_platform_interface/lib/src/pigeon/test_api.dart
rename to packages/firebase_core/firebase_core_platform_interface/test/pigeon/test_api.dart
index 64f4d0a7dae4..9e9677ee6649 100644
--- a/packages/firebase_core/firebase_core_platform_interface/lib/src/pigeon/test_api.dart
+++ b/packages/firebase_core/firebase_core_platform_interface/test/pigeon/test_api.dart
@@ -7,12 +7,11 @@
 // ignore_for_file: avoid_relative_lib_imports
 import 'dart:async';
 import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
+import 'package:firebase_core_platform_interface/src/pigeon/messages.pigeon.dart';
 import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'messages.pigeon.dart';
-
 class _TestFirebaseCoreHostApiCodec extends StandardMessageCodec {
   const _TestFirebaseCoreHostApiCodec();
   @override
@@ -47,18 +46,24 @@ abstract class TestFirebaseCoreHostApi {
   static const MessageCodec<Object?> codec = _TestFirebaseCoreHostApiCodec();
 
   Future<PigeonInitializeResponse> initializeApp(
-      String appName, PigeonFirebaseOptions initializeAppRequest);
+    String appName,
+    PigeonFirebaseOptions initializeAppRequest,
+  );
 
   Future<List<PigeonInitializeResponse?>> initializeCore();
 
   Future<PigeonFirebaseOptions> optionsFromResource();
 
-  static void setup(TestFirebaseCoreHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(
+    TestFirebaseCoreHostApi? api, {
+    BinaryMessenger? binaryMessenger,
+  }) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FirebaseCoreHostApi.initializeApp', codec,
-          binaryMessenger: binaryMessenger);
+        'dev.flutter.pigeon.FirebaseCoreHostApi.initializeApp',
+        codec,
+        binaryMessenger: binaryMessenger,
+      );
       if (api == null) {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel, null);
@@ -66,16 +71,22 @@ abstract class TestFirebaseCoreHostApi {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel,
                 (Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.FirebaseCoreHostApi.initializeApp was null.');
+          assert(
+            message != null,
+            'Argument for dev.flutter.pigeon.FirebaseCoreHostApi.initializeApp was null.',
+          );
           final List<Object?> args = (message as List<Object?>?)!;
           final String? arg_appName = (args[0] as String?);
-          assert(arg_appName != null,
-              'Argument for dev.flutter.pigeon.FirebaseCoreHostApi.initializeApp was null, expected non-null String.');
+          assert(
+            arg_appName != null,
+            'Argument for dev.flutter.pigeon.FirebaseCoreHostApi.initializeApp was null, expected non-null String.',
+          );
           final PigeonFirebaseOptions? arg_initializeAppRequest =
               (args[1] as PigeonFirebaseOptions?);
-          assert(arg_initializeAppRequest != null,
-              'Argument for dev.flutter.pigeon.FirebaseCoreHostApi.initializeApp was null, expected non-null PigeonFirebaseOptions.');
+          assert(
+            arg_initializeAppRequest != null,
+            'Argument for dev.flutter.pigeon.FirebaseCoreHostApi.initializeApp was null, expected non-null PigeonFirebaseOptions.',
+          );
           final PigeonInitializeResponse output =
               await api.initializeApp(arg_appName!, arg_initializeAppRequest!);
           return <Object?>[output];
@@ -84,8 +95,10 @@ abstract class TestFirebaseCoreHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FirebaseCoreHostApi.initializeCore', codec,
-          binaryMessenger: binaryMessenger);
+        'dev.flutter.pigeon.FirebaseCoreHostApi.initializeCore',
+        codec,
+        binaryMessenger: binaryMessenger,
+      );
       if (api == null) {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel, null);
@@ -102,8 +115,10 @@ abstract class TestFirebaseCoreHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FirebaseCoreHostApi.optionsFromResource', codec,
-          binaryMessenger: binaryMessenger);
+        'dev.flutter.pigeon.FirebaseCoreHostApi.optionsFromResource',
+        codec,
+        binaryMessenger: binaryMessenger,
+      );
       if (api == null) {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel, null);
@@ -128,17 +143,22 @@ abstract class TestFirebaseAppHostApi {
   Future<void> setAutomaticDataCollectionEnabled(String appName, bool enabled);
 
   Future<void> setAutomaticResourceManagementEnabled(
-      String appName, bool enabled);
+    String appName,
+    bool enabled,
+  );
 
   Future<void> delete(String appName);
 
-  static void setup(TestFirebaseAppHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(
+    TestFirebaseAppHostApi? api, {
+    BinaryMessenger? binaryMessenger,
+  }) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticDataCollectionEnabled',
-          codec,
-          binaryMessenger: binaryMessenger);
+        'dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticDataCollectionEnabled',
+        codec,
+        binaryMessenger: binaryMessenger,
+      );
       if (api == null) {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel, null);
@@ -146,26 +166,35 @@ abstract class TestFirebaseAppHostApi {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel,
                 (Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticDataCollectionEnabled was null.');
+          assert(
+            message != null,
+            'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticDataCollectionEnabled was null.',
+          );
           final List<Object?> args = (message as List<Object?>?)!;
           final String? arg_appName = (args[0] as String?);
-          assert(arg_appName != null,
-              'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticDataCollectionEnabled was null, expected non-null String.');
+          assert(
+            arg_appName != null,
+            'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticDataCollectionEnabled was null, expected non-null String.',
+          );
           final bool? arg_enabled = (args[1] as bool?);
-          assert(arg_enabled != null,
-              'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticDataCollectionEnabled was null, expected non-null bool.');
+          assert(
+            arg_enabled != null,
+            'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticDataCollectionEnabled was null, expected non-null bool.',
+          );
           await api.setAutomaticDataCollectionEnabled(
-              arg_appName!, arg_enabled!);
+            arg_appName!,
+            arg_enabled!,
+          );
           return <Object?>[];
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticResourceManagementEnabled',
-          codec,
-          binaryMessenger: binaryMessenger);
+        'dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticResourceManagementEnabled',
+        codec,
+        binaryMessenger: binaryMessenger,
+      );
       if (api == null) {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel, null);
@@ -173,25 +202,35 @@ abstract class TestFirebaseAppHostApi {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel,
                 (Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticResourceManagementEnabled was null.');
+          assert(
+            message != null,
+            'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticResourceManagementEnabled was null.',
+          );
           final List<Object?> args = (message as List<Object?>?)!;
           final String? arg_appName = (args[0] as String?);
-          assert(arg_appName != null,
-              'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticResourceManagementEnabled was null, expected non-null String.');
+          assert(
+            arg_appName != null,
+            'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticResourceManagementEnabled was null, expected non-null String.',
+          );
           final bool? arg_enabled = (args[1] as bool?);
-          assert(arg_enabled != null,
-              'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticResourceManagementEnabled was null, expected non-null bool.');
+          assert(
+            arg_enabled != null,
+            'Argument for dev.flutter.pigeon.FirebaseAppHostApi.setAutomaticResourceManagementEnabled was null, expected non-null bool.',
+          );
           await api.setAutomaticResourceManagementEnabled(
-              arg_appName!, arg_enabled!);
+            arg_appName!,
+            arg_enabled!,
+          );
           return <Object?>[];
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FirebaseAppHostApi.delete', codec,
-          binaryMessenger: binaryMessenger);
+        'dev.flutter.pigeon.FirebaseAppHostApi.delete',
+        codec,
+        binaryMessenger: binaryMessenger,
+      );
       if (api == null) {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel, null);
@@ -199,12 +238,16 @@ abstract class TestFirebaseAppHostApi {
         _testBinaryMessengerBinding!.defaultBinaryMessenger
             .setMockDecodedMessageHandler<Object?>(channel,
                 (Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.FirebaseAppHostApi.delete was null.');
+          assert(
+            message != null,
+            'Argument for dev.flutter.pigeon.FirebaseAppHostApi.delete was null.',
+          );
           final List<Object?> args = (message as List<Object?>?)!;
           final String? arg_appName = (args[0] as String?);
-          assert(arg_appName != null,
-              'Argument for dev.flutter.pigeon.FirebaseAppHostApi.delete was null, expected non-null String.');
+          assert(
+            arg_appName != null,
+            'Argument for dev.flutter.pigeon.FirebaseAppHostApi.delete was null, expected non-null String.',
+          );
           await api.delete(arg_appName!);
           return <Object?>[];
         });
diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/test.dart b/packages/firebase_core/firebase_core_platform_interface/test/test.dart
similarity index 69%
rename from packages/firebase_core/firebase_core_platform_interface/lib/test.dart
rename to packages/firebase_core/firebase_core_platform_interface/test/test.dart
index 8790725b6f46..ceb30763c530 100644
--- a/packages/firebase_core/firebase_core_platform_interface/lib/test.dart
+++ b/packages/firebase_core/firebase_core_platform_interface/test/test.dart
@@ -7,5 +7,5 @@
 library;
 
 export 'package:firebase_core_platform_interface/src/pigeon/messages.pigeon.dart';
-export 'package:firebase_core_platform_interface/src/pigeon/mocks.dart';
-export 'package:firebase_core_platform_interface/src/pigeon/test_api.dart';
+export 'pigeon/mocks.dart';
+export 'pigeon/test_api.dart';
diff --git a/packages/firebase_crashlytics/firebase_crashlytics/test/mock.dart b/packages/firebase_crashlytics/firebase_crashlytics/test/mock.dart
index 9fc67af01ba9..834da9bdd62f 100644
--- a/packages/firebase_crashlytics/firebase_crashlytics/test/mock.dart
+++ b/packages/firebase_crashlytics/firebase_crashlytics/test/mock.dart
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_crashlytics_platform_interface/firebase_crashlytics_platform_interface.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/test/mock.dart b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/test/mock.dart
index 15e42383f03c..1660a996e513 100644
--- a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/test/mock.dart
+++ b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/test/mock.dart
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_crashlytics_platform_interface/src/method_channel/method_channel_crashlytics.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/firebase_database/firebase_database/test/mock.dart b/packages/firebase_database/firebase_database/test/mock.dart
index fa4e465063fe..4502686f9740 100644
--- a/packages/firebase_database/firebase_database/test/mock.dart
+++ b/packages/firebase_database/firebase_database/test/mock.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_database/firebase_database_platform_interface/test/test_common.dart b/packages/firebase_database/firebase_database_platform_interface/test/test_common.dart
index e8272a3f348c..8c6f4710dc6a 100644
--- a/packages/firebase_database/firebase_database_platform_interface/test/test_common.dart
+++ b/packages/firebase_database/firebase_database_platform_interface/test/test_common.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void initializeMethodChannel() {
diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/test/mock.dart b/packages/firebase_dynamic_links/firebase_dynamic_links/test/mock.dart
index ff5f77bad688..8f24d4a12bb9 100644
--- a/packages/firebase_dynamic_links/firebase_dynamic_links/test/mock.dart
+++ b/packages/firebase_dynamic_links/firebase_dynamic_links/test/mock.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/test/mock.dart b/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/test/mock.dart
index daa46be29a45..1225d0177b32 100644
--- a/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/test/mock.dart
+++ b/packages/firebase_dynamic_links/firebase_dynamic_links_platform_interface/test/mock.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_dynamic_links_platform_interface/src/method_channel/method_channel_firebase_dynamic_links.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/test/firebase_in_app_messaging_test.dart b/packages/firebase_in_app_messaging/firebase_in_app_messaging/test/firebase_in_app_messaging_test.dart
index 8af599eb222e..c0b565f0f91d 100644
--- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/test/firebase_in_app_messaging_test.dart
+++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/test/firebase_in_app_messaging_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_in_app_messaging/firebase_in_app_messaging.dart';
 import 'package:firebase_in_app_messaging_platform_interface/firebase_in_app_messaging_platform_interface.dart';
 import 'package:flutter/services.dart';
diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/test/mock.dart b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/test/mock.dart
index 07d9796577fb..b723081dc028 100644
--- a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/test/mock.dart
+++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/test/mock.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_in_app_messaging_platform_interface/src/method_channel/method_channel_firebase_in_app_messaging.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/firebase_messaging/firebase_messaging/test/mock.dart b/packages/firebase_messaging/firebase_messaging/test/mock.dart
index 2493e87ee85b..a8b908cca61e 100644
--- a/packages/firebase_messaging/firebase_messaging/test/mock.dart
+++ b/packages/firebase_messaging/firebase_messaging/test/mock.dart
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_messaging_platform_interface/firebase_messaging_platform_interface.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/firebase_messaging/firebase_messaging_platform_interface/test/mock.dart b/packages/firebase_messaging/firebase_messaging_platform_interface/test/mock.dart
index b2b47fb88295..7d0e92b5776e 100644
--- a/packages/firebase_messaging/firebase_messaging_platform_interface/test/mock.dart
+++ b/packages/firebase_messaging/firebase_messaging_platform_interface/test/mock.dart
@@ -4,7 +4,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_messaging_platform_interface/src/method_channel/method_channel_messaging.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/test/mock.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/test/mock.dart
index 147a74550d98..c4f96c73b04c 100644
--- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/test/mock.dart
+++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/test/mock.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/test/mock.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/test/mock.dart
index 655358e4cdf4..d521aa4f8cfc 100644
--- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/test/mock.dart
+++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader_platform_interface/test/mock.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_ml_model_downloader_platform_interface/src/method_channel/method_channel_firebase_ml_model_downloader.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/firebase_performance/firebase_performance/test/mock.dart b/packages/firebase_performance/firebase_performance/test/mock.dart
index 59d85c89ab98..a6d4c124c9bb 100644
--- a/packages/firebase_performance/firebase_performance/test/mock.dart
+++ b/packages/firebase_performance/firebase_performance/test/mock.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_performance/firebase_performance_platform_interface/test/mock.dart b/packages/firebase_performance/firebase_performance_platform_interface/test/mock.dart
index 9bcbb3f6ce07..fe6ff210ecc0 100644
--- a/packages/firebase_performance/firebase_performance_platform_interface/test/mock.dart
+++ b/packages/firebase_performance/firebase_performance_platform_interface/test/mock.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:firebase_performance_platform_interface/src/method_channel/method_channel_firebase_performance.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/firebase_remote_config/firebase_remote_config/test/mock.dart b/packages/firebase_remote_config/firebase_remote_config/test/mock.dart
index 4c73b4ae5beb..80f65307d5a1 100644
--- a/packages/firebase_remote_config/firebase_remote_config/test/mock.dart
+++ b/packages/firebase_remote_config/firebase_remote_config/test/mock.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:firebase_core_platform_interface/test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/firebase_storage/firebase_storage/test/mock.dart b/packages/firebase_storage/firebase_storage/test/mock.dart
index 0c64c460a9ab..58d4f6e5ceed 100644
--- a/packages/firebase_storage/firebase_storage/test/mock.dart
+++ b/packages/firebase_storage/firebase_storage/test/mock.dart
@@ -7,12 +7,12 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_core_platform_interface/test.dart';
 import 'package:firebase_storage_platform_interface/firebase_storage_platform_interface.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 
 typedef Callback = Function(MethodCall call);
 
diff --git a/packages/firebase_storage/firebase_storage_platform_interface/test/mock.dart b/packages/firebase_storage/firebase_storage_platform_interface/test/mock.dart
index 7e6328a0a6c8..d1e364d834b9 100644
--- a/packages/firebase_storage/firebase_storage_platform_interface/test/mock.dart
+++ b/packages/firebase_storage/firebase_storage_platform_interface/test/mock.dart
@@ -4,10 +4,10 @@
 // found in the LICENSE file.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
 import 'package:firebase_storage_platform_interface/src/method_channel/method_channel_firebase_storage.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 
 typedef MethodCallCallback = dynamic Function(MethodCall methodCall);
 typedef Callback = Function(MethodCall call);
diff --git a/packages/firebase_vertexai/firebase_vertexai/test/mock.dart b/packages/firebase_vertexai/firebase_vertexai/test/mock.dart
index ed883d924371..bd06fba9d393 100644
--- a/packages/firebase_vertexai/firebase_vertexai/test/mock.dart
+++ b/packages/firebase_vertexai/firebase_vertexai/test/mock.dart
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:firebase_core_platform_interface/test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+import '../../../firebase_core/firebase_core_platform_interface/test/test.dart';
 
 class MockFirebaseAppVertexAI implements TestFirebaseCoreHostApi {
   @override