diff --git a/pkg/analyzer_testing/lib/src/analysis_rule/pub_package_resolution.dart b/pkg/analyzer_testing/lib/src/analysis_rule/pub_package_resolution.dart
index e5c2869ec2e..6c60548fd8d 100644
--- a/pkg/analyzer_testing/lib/src/analysis_rule/pub_package_resolution.dart
+++ b/pkg/analyzer_testing/lib/src/analysis_rule/pub_package_resolution.dart
@@ -13,12 +13,12 @@ import 'package:analyzer/src/dart/analysis/byte_store.dart'; // ignore: implemen
 import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart'; // ignore: implementation_imports
 import 'package:analyzer/src/dart/analysis/experiments.dart'; // ignore: implementation_imports
 import 'package:analyzer/src/error/codes.dart'; // ignore: implementation_imports
-import 'package:analyzer/src/lint/util.dart'; // ignore: implementation_imports
 import 'package:analyzer/src/test_utilities/mock_sdk.dart'; // ignore: implementation_imports
 import 'package:analyzer/utilities/package_config_file_builder.dart';
 import 'package:analyzer_testing/experiments/experiments.dart';
 import 'package:analyzer_testing/mock_packages/mock_packages.dart';
 import 'package:analyzer_testing/resource_provider_mixin.dart';
+import 'package:analyzer_testing/src/spelunker.dart';
 import 'package:analyzer_testing/utilities/utilities.dart';
 import 'package:meta/meta.dart';
 import 'package:test/test.dart';
diff --git a/pkg/analyzer/lib/src/lint/util.dart b/pkg/analyzer_testing/lib/src/spelunker.dart
similarity index 97%
rename from pkg/analyzer/lib/src/lint/util.dart
rename to pkg/analyzer_testing/lib/src/spelunker.dart
index ccef1759d9e..242975a12db 100644
--- a/pkg/analyzer/lib/src/lint/util.dart
+++ b/pkg/analyzer_testing/lib/src/spelunker.dart
@@ -27,7 +27,7 @@ final class Spelunker {
   }
 }
 
-class _SourceVisitor extends GeneralizingAstVisitor {
+class _SourceVisitor extends GeneralizingAstVisitor<void> {
   int indent = 0;
 
   final StringSink sink;
diff --git a/pkg/analyzer_testing/pubspec.yaml b/pkg/analyzer_testing/pubspec.yaml
index 8523d3502e3..2699aaa2a94 100644
--- a/pkg/analyzer_testing/pubspec.yaml
+++ b/pkg/analyzer_testing/pubspec.yaml
@@ -22,4 +22,5 @@ dependencies:
 # See also https://dart.dev/tools/pub/dependencies.
 dev_dependencies:
   analyzer_utilities: any
+  args: any
   lints: any
diff --git a/pkg/linter/tool/spelunk.dart b/pkg/analyzer_testing/tool/spelunk.dart
similarity index 89%
rename from pkg/linter/tool/spelunk.dart
rename to pkg/analyzer_testing/tool/spelunk.dart
index 6b6ff1558a4..30e360b0e15 100644
--- a/pkg/linter/tool/spelunk.dart
+++ b/pkg/analyzer_testing/tool/spelunk.dart
@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import 'package:analyzer/src/lint/util.dart' show Spelunker;
+import 'package:analyzer_testing/src/spelunker.dart';
 import 'package:args/args.dart';
 
 /// AST Spelunker