diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index 59f19e8dda5..4ac26b408b0 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -25,6 +25,8 @@ final List<String> flutterTestArgs = <String>[];
 
 final bool useFlutterTestFormatter = Platform.environment['FLUTTER_TEST_FORMATTER'] == 'true';
 
+final bool noUseBuildRunner = Platform.environment['FLUTTER_TEST_NO_BUILD_RUNNER'] == 'true';
+
 const Map<String, ShardRunner> _kShards = <String, ShardRunner>{
   'tests': _runTests,
   'tool_tests': _runToolTests,
@@ -178,11 +180,18 @@ Future<void> _runToolTests() async {
   final bq.BigqueryApi bigqueryApi = await _getBigqueryApi();
   await _runSmokeTests();
 
-  await _buildRunnerTest(
-    path.join(flutterRoot, 'packages', 'flutter_tools'),
-    flutterRoot,
-    tableData: bigqueryApi?.tabledata,
-  );
+  if (noUseBuildRunner) {
+    await _pubRunTest(
+      path.join(flutterRoot, 'packages', 'flutter_tools'),
+      tableData: bigqueryApi?.tabledata,
+    );
+  } else {
+    await _buildRunnerTest(
+      path.join(flutterRoot, 'packages', 'flutter_tools'),
+      flutterRoot,
+      tableData: bigqueryApi?.tabledata,
+    );
+  }
 
   print('${bold}DONE: All tests successful.$reset');
 }