diff --git a/analysis_options.yaml b/analysis_options.yaml
index 14cebb5a69..cdd7ad66fd 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -55,9 +55,12 @@ linter:
     # - avoid_catches_without_on_clauses # we do this commonly
     # - avoid_catching_errors # we do this commonly
     - avoid_classes_with_only_static_members
+    # - avoid_double_and_int_checks # not yet tested
     - avoid_empty_else
+    # - avoid_field_initializers_in_const_classes # not yet tested
     - avoid_function_literals_in_foreach_calls
     - avoid_init_to_null
+    # - avoid_js_rounded_ints # not yet tested
     - avoid_null_checks_in_equality_operators
     # - avoid_positional_boolean_parameters # not yet tested
     # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
@@ -123,6 +126,7 @@ linter:
     # - prefer_function_declarations_over_variables # not yet tested
     - prefer_initializing_formals
     # - prefer_interpolation_to_compose_strings # not yet tested
+    # - prefer_iterable_whereType # not yet tested
     - prefer_is_empty
     - prefer_is_not_empty
     - prefer_single_quotes
@@ -152,3 +156,4 @@ linter:
     # - use_string_buffers # https://github.com/dart-lang/linter/pull/664
     # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
     - valid_regexps
+    # - void_checks # not yet tested
diff --git a/analysis_options_repo.yaml b/analysis_options_repo.yaml
index bbbb79fe5c..b9f61fdc8e 100644
--- a/analysis_options_repo.yaml
+++ b/analysis_options_repo.yaml
@@ -52,9 +52,12 @@ linter:
     # - avoid_catches_without_on_clauses # we do this commonly
     # - avoid_catching_errors # we do this commonly
     - avoid_classes_with_only_static_members
+    # - avoid_double_and_int_checks # not yet tested
     - avoid_empty_else
+    # - avoid_field_initializers_in_const_classes # not yet tested
     - avoid_function_literals_in_foreach_calls
     - avoid_init_to_null
+    # - avoid_js_rounded_ints # not yet tested
     - avoid_null_checks_in_equality_operators
     # - avoid_positional_boolean_parameters # not yet tested
     # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
@@ -120,6 +123,7 @@ linter:
     # - prefer_function_declarations_over_variables # not yet tested
     - prefer_initializing_formals
     # - prefer_interpolation_to_compose_strings # not yet tested
+    # - prefer_iterable_whereType # not yet tested
     - prefer_is_empty
     - prefer_is_not_empty
     - prefer_single_quotes
@@ -150,3 +154,4 @@ linter:
     # - use_string_buffers # https://github.com/dart-lang/linter/pull/664
     # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
     - valid_regexps
+    # - void_checks # not yet tested