@@ -245,7 +245,7 @@ List<FlutterCommand> generateCommands({
   DaemonCommand(hidden: !verboseHelp),
   DebugAdapterCommand(verboseHelp: verboseHelp),
   DevicesCommand(verboseHelp: verboseHelp),
-  DoctorCommand(verbose: verbose),
+  DoctorCommand(verbose: verbose, toolContext: toolDependencies.toolContext),
   DowngradeCommand(verboseHelp: verboseHelp, logger: toolDependencies.toolContext.logger),
   DriveCommand(
     verboseHelp: verboseHelp,
 
@@ -4,11 +4,20 @@
 
 import '../android/android_workflow.dart';
 import '../base/common.dart';
+import '../context/tool_context.dart';
+import '../doctor.dart';
 import '../globals.dart' as globals;
 import '../runner/flutter_command.dart';
 
 class DoctorCommand extends FlutterCommand {
-  DoctorCommand({this.verbose = false}) {
+  DoctorCommand({
+    required ToolContext toolContext,
+    Doctor? doctor,
+    AndroidLicenseValidator? androidLicenseValidator,
+    this.verbose = false,
+  }) : _doctor = doctor,
+       _androidLicenseValidator = androidLicenseValidator,
+       super(toolContext: toolContext) {
     argParser.addFlag(
       'android-licenses',
       negatable: false,
@@ -24,8 +33,14 @@ class DoctorCommand extends FlutterCommand {
     );
   }
 
+  final Doctor? _doctor;
+  final AndroidLicenseValidator? _androidLicenseValidator;
   final bool verbose;
 
+  Doctor? get _effectiveDoctor => _doctor ?? (toolContext == null ? globals.doctor : null);
+  AndroidLicenseValidator? get _effectiveAndroidLicenseValidator =>
+      _androidLicenseValidator ?? (toolContext == null ? androidLicenseValidator : null);
+
   @override
   final name = 'doctor';
 
@@ -37,10 +52,11 @@ class DoctorCommand extends FlutterCommand {
 
   @override
   Future<FlutterCommandResult> runCommand() async {
+    final Doctor? doctor = _effectiveDoctor;
     if (argResults?.wasParsed('check-for-remote-artifacts') ?? false) {
       final String engineRevision = stringArg('check-for-remote-artifacts')!;
       if (engineRevision.startsWith(RegExp(r'[a-f0-9]{1,40}'))) {
-        final bool success = await globals.doctor?.checkRemoteArtifacts(engineRevision) ?? false;
+        final bool success = await doctor?.checkRemoteArtifacts(engineRevision) ?? false;
         if (success) {
           throwToolExit(
             'Artifacts for engine $engineRevision are missing or are '
@@ -56,10 +72,10 @@ class DoctorCommand extends FlutterCommand {
       }
     }
     final bool success =
-        await globals.doctor?.diagnose(
+        await doctor?.diagnose(
           androidLicenses: boolArg('android-licenses'),
           verbose: verbose,
-          androidLicenseValidator: androidLicenseValidator,
+          androidLicenseValidator: _effectiveAndroidLicenseValidator,
         ) ??
         false;
     return FlutterCommandResult(success ? ExitStatus.success : ExitStatus.warning);