diff --git a/BUILD.gn b/BUILD.gn
index e4ce1dea10ba6..f03094d02ffad 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -73,8 +73,8 @@ group("flutter") {
 
     if (is_win) {
       public_deps += [
+        "$flutter_root/shell/platform/windows:flutter_windows_unittests",
         "$flutter_root/shell/platform/windows/client_wrapper:client_wrapper_windows_unittests",
-        "$flutter_root/shell/platform/windows:flutter_windows_unittests"
       ]
     }
 
diff --git a/frontend_server/BUILD.gn b/frontend_server/BUILD.gn
index 6cb8ce88f3c02..c4060a5df66ba 100644
--- a/frontend_server/BUILD.gn
+++ b/frontend_server/BUILD.gn
@@ -19,8 +19,8 @@ if (is_fuchsia_host || is_fuchsia) {
       "//third_party/dart-pkg/pub/path",
       "//third_party/dart-pkg/pub/usage",
       "//third_party/dart/pkg/build_integration",
-      "//third_party/dart/pkg/frontend_server",
       "//third_party/dart/pkg/front_end",
+      "//third_party/dart/pkg/frontend_server",
       "//third_party/dart/pkg/kernel",
       "//third_party/dart/pkg/vm",
     ]
@@ -39,4 +39,3 @@ if (is_fuchsia_host || is_fuchsia) {
     ]
   }
 }
-
diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn
index 7f94225e984a9..cd496949eacbc 100644
--- a/shell/platform/windows/BUILD.gn
+++ b/shell/platform/windows/BUILD.gn
@@ -109,23 +109,24 @@ executable("flutter_windows_unittests") {
   testonly = true
 
   sources = [
-    "win32_window_unittests.cc",
-    "testing/win32_flutter_window_test.h",
     "testing/win32_flutter_window_test.cc",
+    "testing/win32_flutter_window_test.h",
+    "win32_window_unittests.cc",
   ]
 
   public_configs = [ "$flutter_root:config" ]
 
   deps = [
-    ":flutter_windows_source",
-    ":flutter_windows_headers",
-    "//third_party/rapidjson",
     ":flutter_windows_fixtures",
+    ":flutter_windows_headers",
+    ":flutter_windows_source",
     "$flutter_root/testing",
+
     # TODO(chunhtai): Consider refactoring flutter_root/testing so that there's a testing
     # target that doesn't require a Dart runtime to be linked in.
     # https://github.com/flutter/flutter/issues/41414.
     "//third_party/dart/runtime:libdart_jit",
+    "//third_party/rapidjson",
   ]
 }