diff --git a/BUILD.gn b/BUILD.gn
index e09625e175e88..c10f91271269b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -224,7 +224,7 @@ group("unittests") {
       ]
     }
 
-    if (!is_win && !is_fuchsia) {
+    if (!is_fuchsia) {
       public_deps += [
         "//flutter/shell/platform/android/external_view_embedder:android_external_view_embedder_unittests",
         "//flutter/shell/platform/android/jni:jni_unittests",
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc
index 2ec5a9ac198a7..9b1caee534c22 100644
--- a/shell/platform/android/external_view_embedder/external_view_embedder.cc
+++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc
@@ -99,7 +99,7 @@ void AndroidExternalViewEmbedder::SubmitFlutterView(
     // This is done by querying the r-tree that holds the records for the
     // picture recorder corresponding to the flow layers added after a platform
     // view layer.
-    for (ssize_t j = i; j >= 0; j--) {
+    for (ptrdiff_t /* portable, ssize_t is not */ j = i; j >= 0; j--) {
       int64_t current_view_id = composition_order_[j];
       SkRect current_view_rect = GetViewRect(current_view_id);
       // The rect above the `current_view_rect`
diff --git a/testing/run_tests.py b/testing/run_tests.py
index bd3712d63f339..af2871cace0fe 100755
--- a/testing/run_tests.py
+++ b/testing/run_tests.py
@@ -373,6 +373,7 @@ def make_test(name, flags=None, extra_env=None):
     return (name, flags, extra_env)
 
   unittests = [
+      make_test('android_external_view_embedder_unittests'),
       make_test('client_wrapper_glfw_unittests'),
       make_test('client_wrapper_unittests'),
       make_test('common_cpp_core_unittests'),
@@ -383,9 +384,11 @@ def make_test(name, flags=None, extra_env=None):
       make_test('embedder_a11y_unittests'),
       make_test('embedder_proctable_unittests'),
       make_test('embedder_unittests'),
-      make_test('fml_unittests'),
       make_test('fml_arc_unittests'),
+      make_test('fml_unittests'),
+      make_test('jni_unittests'),
       make_test('no_dart_plugin_registrant_unittests'),
+      make_test('platform_view_android_delegate_unittests'),
       make_test('runtime_unittests'),
       make_test('testing_unittests'),
       make_test('tonic_unittests'),
@@ -393,12 +396,11 @@ def make_test(name, flags=None, extra_env=None):
       make_test('ui_unittests', flags=repeat_flags + ['--timeout=90']),
   ]
 
+  # Print if the machine is detected as "is_windows()"
+  print('is_windows() = %s, on sys_paltorm = %s' % (is_windows(), sys_platform))
+
   if not is_windows():
     unittests += [
-        # https://github.com/google/googletest/issues/2490
-        make_test('android_external_view_embedder_unittests'),
-        make_test('jni_unittests'),
-        make_test('platform_view_android_delegate_unittests'),
         # https://github.com/flutter/flutter/issues/36295
         make_test('shell_unittests'),
     ]