diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4916a66e16..a6402cde72 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -20,8 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         sdk: [dev, stable]
-        # Add sdk-analyzer once #2500 is addressed
-        job: [main, flutter, packages, sdk-docs]
+        job: [main, flutter, sdk-analyzer, packages, sdk-docs]
         include:
           - os: macos-latest
             sdk: dev
diff --git a/pubspec.yaml b/pubspec.yaml
index 5aeb5f617b..2bb494c80c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,7 +32,6 @@ dev_dependencies:
   build_version: ^2.0.1
   coverage: ^0.14.0
   dart_style: ^1.3.9
-  dhttpd: ^3.0.0
   grinder: ^0.8.2
   http: ^0.12.0
   pedantic: ^1.9.0
diff --git a/tool/grind.dart b/tool/grind.dart
index c857f1d7bf..6b8ff51370 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -470,6 +470,13 @@ Future<String> createSdkDartdoc(bool overrideMeta) async {
   dartdocPubspec.writeAsStringSync('''
 
 dependency_overrides:
+  args: ^2.0.0-nullsafety.0
+  cli_util: ^0.3.0-nullsafety.0
+  crypto: ^3.0.0-nullsafety.0
+  glob: ^2.0.0-nullsafety.0
+  package_config: ^2.0.0-nullsafety.0
+  pub_semver: ^2.0.0-nullsafety.0
+  yaml: ^3.0.0-nullsafety.0
   analyzer:
     path: '${sdkClone.path}/pkg/analyzer'
   _fe_analyzer_shared:
@@ -598,6 +605,7 @@ Future<void> startTestPackageDocsServer() async {
   log('launching dhttpd on port 8002 for SDK');
   var launcher = SubprocessLauncher('serve-test-package-docs');
   await launcher.runStreamed(sdkBin('pub'), [
+    'global',
     'run',
     'dhttpd',
     '--port',
@@ -617,8 +625,8 @@ Future<void> _serveDocsFrom(String servePath, int port, String context) async {
     await launcher.runStreamed(sdkBin('pub'), ['global', 'activate', 'dhttpd']);
     _serveReady = true;
   }
-  await launcher.runStreamed(
-      sdkBin('pub'), ['run', 'dhttpd', '--port', '$port', '--path', servePath]);
+  await launcher.runStreamed(sdkBin('pub'),
+      ['global', 'run', 'dhttpd', '--port', '$port', '--path', servePath]);
 }
 
 @Task('Serve generated SDK docs locally with dhttpd on port 8000')
@@ -627,6 +635,7 @@ Future<void> serveSdkDocs() async {
   log('launching dhttpd on port 8000 for SDK');
   var launcher = SubprocessLauncher('serve-sdk-docs');
   await launcher.runStreamed(sdkBin('pub'), [
+    'global',
     'run',
     'dhttpd',
     '--port',
@@ -668,6 +677,7 @@ Future<void> compareFlutterWarnings() async {
     var launcher = SubprocessLauncher('serve-flutter-docs');
     await launcher.runStreamed(sdkBin('pub'), ['get']);
     Future original = launcher.runStreamed(sdkBin('pub'), [
+      'global',
       'run',
       'dhttpd',
       '--port',
@@ -676,6 +686,7 @@ Future<void> compareFlutterWarnings() async {
       path.join(originalDartdocFlutter.absolute.path, 'dev', 'docs', 'doc'),
     ]);
     Future current = launcher.runStreamed(sdkBin('pub'), [
+      'global',
       'run',
       'dhttpd',
       '--port',
@@ -694,6 +705,7 @@ Future<void> serveFlutterDocs() async {
   var launcher = SubprocessLauncher('serve-flutter-docs');
   await launcher.runStreamed(sdkBin('pub'), ['get']);
   await launcher.runStreamed(sdkBin('pub'), [
+    'global',
     'run',
     'dhttpd',
     '--port',