diff --git a/mobile/analysis_options.yaml b/mobile/analysis_options.yaml
index 0b08791dc8..fe5729fc60 100644
--- a/mobile/analysis_options.yaml
+++ b/mobile/analysis_options.yaml
@@ -34,7 +34,6 @@ linter:
 analyzer:
   exclude:
     - openapi/**
-    - openapi/test/**
     - lib/generated_plugin_registrant.dart
 
 plugins:
diff --git a/mobile/openapi/analysis_options.yaml b/mobile/openapi/analysis_options.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/open-api/bin/generate-open-api.sh b/open-api/bin/generate-open-api.sh
index ba62bfd9ee..c972a4c806 100755
--- a/open-api/bin/generate-open-api.sh
+++ b/open-api/bin/generate-open-api.sh
@@ -14,6 +14,9 @@ function dart {
   # Post generate patches
   patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./patch/api_client.dart.patch
   patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api.dart <./patch/api.dart.patch
+  # Don't include analysis_options.yaml for the generated openapi files
+  # so that language servers can properly exclude the mobile/openapi directory
+  rm ../mobile/openapi/analysis_options.yaml
 }
 
 function typescript {