diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
index 14ffe3d669c09..8b53440c84c43 100644
--- a/ci/licenses_golden/licenses_flutter
+++ b/ci/licenses_golden/licenses_flutter
@@ -2619,16 +2619,16 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBacki
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderUnittests.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositorUnittests.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositorTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureUnittests.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderUnittests.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h
@@ -2641,7 +2641,7 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSur
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerUnittests.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardViewDelegate.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.mm
@@ -2682,7 +2682,7 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewC
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderUnittests.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h
diff --git a/shell/platform/darwin/macos/BUILD.gn b/shell/platform/darwin/macos/BUILD.gn
index 059b2bc4e57e7..935a3c3591978 100644
--- a/shell/platform/darwin/macos/BUILD.gn
+++ b/shell/platform/darwin/macos/BUILD.gn
@@ -165,14 +165,14 @@ executable("flutter_desktop_darwin_unittests") {
 
   sources = [
     "framework/Source/AccessibilityBridgeMacTest.mm",
-    "framework/Source/FlutterChannelKeyResponderUnittests.mm",
-    "framework/Source/FlutterCompositorUnittests.mm",
-    "framework/Source/FlutterEmbedderExternalTextureUnittests.mm",
-    "framework/Source/FlutterEmbedderKeyResponderUnittests.mm",
+    "framework/Source/FlutterChannelKeyResponderTest.mm",
+    "framework/Source/FlutterCompositorTest.mm",
+    "framework/Source/FlutterEmbedderExternalTextureTest.mm",
+    "framework/Source/FlutterEmbedderKeyResponderTest.mm",
     "framework/Source/FlutterEngineTest.mm",
     "framework/Source/FlutterEngineTestUtils.h",
     "framework/Source/FlutterEngineTestUtils.mm",
-    "framework/Source/FlutterKeyboardManagerUnittests.mm",
+    "framework/Source/FlutterKeyboardManagerTest.mm",
     "framework/Source/FlutterMenuPluginTest.mm",
     "framework/Source/FlutterPlatformNodeDelegateMacTest.mm",
     "framework/Source/FlutterPlatformViewControllerTest.mm",
@@ -183,7 +183,7 @@ executable("flutter_desktop_darwin_unittests") {
     "framework/Source/FlutterViewControllerTest.mm",
     "framework/Source/FlutterViewControllerTestUtils.h",
     "framework/Source/FlutterViewControllerTestUtils.mm",
-    "framework/Source/FlutterViewEngineProviderUnitTests.mm",
+    "framework/Source/FlutterViewEngineProviderTest.mm",
     "framework/Source/TestFlutterPlatformView.h",
     "framework/Source/TestFlutterPlatformView.mm",
   ]
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm
similarity index 100%
rename from shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderUnittests.mm
rename to shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterCompositorUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterCompositorTest.mm
similarity index 100%
rename from shell/platform/darwin/macos/framework/Source/FlutterCompositorUnittests.mm
rename to shell/platform/darwin/macos/framework/Source/FlutterCompositorTest.mm
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm
similarity index 100%
rename from shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureUnittests.mm
rename to shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm
similarity index 100%
rename from shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderUnittests.mm
rename to shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerTest.mm
similarity index 100%
rename from shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerUnittests.mm
rename to shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerTest.mm
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm
similarity index 100%
rename from shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderUnittests.mm
rename to shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm