diff --git a/.ci.yaml b/.ci.yaml
index cf6b714d90..a08f72dfed 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -214,6 +214,40 @@ targets:
       channel: stable
       version_file: flutter_stable.version
 
+  - name: Linux_android custom_package_tests master
+    bringup: true # New target
+    recipe: packages/packages
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_master.version
+      target_file: linux_custom_package_tests.yaml
+      cores: "32"
+      # Pigeon tests need Andoid deps (thus the Linux_android base) and
+      # clang-format.
+      dependencies: >-
+        [
+          {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}
+        ]
+      channel: master
+
+  - name: Linux_android custom_package_tests stable
+    bringup: true # New target
+    recipe: packages/packages
+    timeout: 30
+    properties:
+      add_recipes_cq: "true"
+      version_file: flutter_stable.version
+      target_file: linux_custom_package_tests.yaml
+      cores: "32"
+      # Pigeon tests need Android deps (thus the Linux_android base) and
+      # clang-format.
+      dependencies: >-
+        [
+          {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}
+        ]
+      channel: stable
+
   ### Android tasks ###
   - name: Linux_android android_build_all_packages master
     recipe: packages/packages
diff --git a/.ci/scripts/custom_package_tests.sh b/.ci/scripts/custom_package_tests.sh
index c6473b267d..85155ddb8b 100755
--- a/.ci/scripts/custom_package_tests.sh
+++ b/.ci/scripts/custom_package_tests.sh
@@ -4,11 +4,5 @@
 # found in the LICENSE file.
 set -e
 
-# Exclusions
-#
-# script/configs/linux_only_custom_test.yaml
-#   Custom tests need Chrome. (They run in linux-custom_package_tests)
-
 dart ./script/tool/bin/flutter_plugin_tools.dart custom-test \
-   --packages-for-branch --log-timing \
-   --exclude=script/configs/linux_only_custom_test.yaml
+   --packages-for-branch --log-timing
diff --git a/.ci/targets/linux_custom_package_tests.yaml b/.ci/targets/linux_custom_package_tests.yaml
new file mode 100644
index 0000000000..8c691789a8
--- /dev/null
+++ b/.ci/targets/linux_custom_package_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: custom tests
+    script: script/tool_runner.sh
+    args: ["custom-test"]
diff --git a/packages/cross_file/tool/run_tests.dart b/packages/cross_file/tool/run_tests.dart
deleted file mode 100644
index 9d569b5211..0000000000
--- a/packages/cross_file/tool/run_tests.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Runs `dart test -p chrome` in the root of the cross_file package.
-//
-// Called from the custom-tests CI action.
-//
-// usage: dart run tool/run_tests.dart
-// (needs a `chrome` executable in $PATH, or a tweak to dart_test.yaml)
-import 'dart:async';
-import 'dart:io';
-import 'package:path/path.dart' as p;
-
-Future<void> main(List<String> args) async {
-  final Directory workingDir =
-      Directory(p.dirname(Platform.script.path)).parent;
-
-  final int status = await _runProcess(
-    'dart',
-    <String>[
-      'test',
-      '-p',
-      'chrome',
-    ],
-    workingDirectory: workingDir.path,
-  );
-
-  exit(status);
-}
-
-Future<Process> _streamOutput(Future<Process> processFuture) async {
-  final Process process = await processFuture;
-  unawaited(stdout.addStream(process.stdout));
-  unawaited(stderr.addStream(process.stderr));
-  return process;
-}
-
-Future<int> _runProcess(
-  String command,
-  List<String> arguments, {
-  String? workingDirectory,
-}) async {
-  final Process process = await _streamOutput(Process.start(
-    command,
-    arguments,
-    workingDirectory: workingDirectory,
-  ));
-  return process.exitCode;
-}
diff --git a/packages/google_identity_services_web/tool/run_tests.dart b/packages/google_identity_services_web/tool/run_tests.dart
deleted file mode 100644
index 552cd8d00e..0000000000
--- a/packages/google_identity_services_web/tool/run_tests.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Runs `dart test -p chrome` in the root of the google_identity_services_web package.
-//
-// Called from the custom-tests CI action.
-//
-// usage: dart run tool/run_tests.dart
-// (needs a `chrome` executable in $PATH, or a tweak to dart_test.yaml)
-import 'dart:async';
-import 'dart:io';
-import 'package:path/path.dart' as p;
-
-Future<void> main(List<String> args) async {
-  final Directory workingDir =
-      Directory(p.dirname(Platform.script.path)).parent;
-
-  final int status = await _runProcess(
-    'dart',
-    <String>[
-      'test',
-      '-p',
-      'chrome',
-    ],
-    workingDirectory: workingDir.path,
-  );
-
-  exit(status);
-}
-
-Future<Process> _streamOutput(Future<Process> processFuture) async {
-  final Process process = await processFuture;
-  unawaited(stdout.addStream(process.stdout));
-  unawaited(stderr.addStream(process.stderr));
-  return process;
-}
-
-Future<int> _runProcess(
-  String command,
-  List<String> arguments, {
-  String? workingDirectory,
-}) async {
-  final Process process = await _streamOutput(Process.start(
-    command,
-    arguments,
-    workingDirectory: workingDirectory,
-  ));
-  return process.exitCode;
-}
diff --git a/script/configs/linux_only_custom_test.yaml b/script/configs/linux_only_custom_test.yaml
deleted file mode 100644
index 8313d41be1..0000000000
--- a/script/configs/linux_only_custom_test.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Packages that only support `custom-test` in linux, because that's
-# the only place where we install Chrome.
-#
-# This file is used to "--exclude" these packages from the relevant
-# mac/windows CI test runs.
-
-- cross_file
-- google_identity_services_web
-