diff --git a/analysis_options.yaml b/analysis_options.yaml
index f2c2f254af..c69be69883 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -85,10 +85,10 @@ linter:
     - avoid_null_checks_in_equality_operators
     # - avoid_positional_boolean_parameters # not yet tested
     - avoid_return_types_on_setters
-    # - avoid_returning_null # not yet tested
-    # - avoid_returning_this # not yet tested
+    # - avoid_returning_null # we do this commonly
+    # - avoid_returning_this # https://github.com/dart-lang/linter/issues/842
     # - avoid_setters_without_getters # not yet tested
-    # - avoid_types_on_closure_parameters # not yet tested
+    # - avoid_types_on_closure_parameters # conflicts with always_specify_types
     - await_only_futures
     - camel_case_types
     # - cascade_invocations # not yet tested
diff --git a/analysis_options_repo.yaml b/analysis_options_repo.yaml
index 538e992e00..3cf53f4107 100644
--- a/analysis_options_repo.yaml
+++ b/analysis_options_repo.yaml
@@ -79,10 +79,10 @@ linter:
     - avoid_null_checks_in_equality_operators
     # - avoid_positional_boolean_parameters # not yet tested
     - avoid_return_types_on_setters
-    # - avoid_returning_null # not yet tested
-    # - avoid_returning_this # not yet tested
+    # - avoid_returning_null # we do this commonly
+    # - avoid_returning_this # https://github.com/dart-lang/linter/issues/842
     # - avoid_setters_without_getters # not yet tested
-    # - avoid_types_on_closure_parameters # not yet tested
+    # - avoid_types_on_closure_parameters # conflicts with always_specify_types
     - await_only_futures
     - camel_case_types
     # - cascade_invocations # not yet tested