diff --git a/pkg/pkg.status b/pkg/pkg.status
index 2c26a32342b..2fa7f841cea 100644
--- a/pkg/pkg.status
+++ b/pkg/pkg.status
@@ -153,7 +153,7 @@ analyzer/test/*: Skip # Issue 26813
 analyzer/tool/*: Skip # Issue 26813
 
 # Don't analyze tests in strong mode yet
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 # Analyze dev_compiler but only run its tests on the vm
diff --git a/pkg/status_file/test/data/vm.status b/pkg/status_file/test/data/vm.status
index 05d90299eca..e4463564221 100644
--- a/pkg/status_file/test/data/vm.status
+++ b/pkg/status_file/test/data/vm.status
@@ -129,7 +129,7 @@ dart/data_uri*test: Skip # Data uri's not supported by dart2js or the analyzer.
 dart/optimized_stacktrace_line_test: StaticWarning
 dart/optimized_stacktrace_line_and_column_test: StaticWarning
 
-[ $compiler == dart2analyzer && $builder_tag == strong ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 [ $compiler == app_jit ]
diff --git a/runtime/observatory/tests/service/service.status b/runtime/observatory/tests/service/service.status
index c2f3ad8470f..ce8de6170ef 100644
--- a/runtime/observatory/tests/service/service.status
+++ b/runtime/observatory/tests/service/service.status
@@ -69,7 +69,7 @@ get_cpu_profile_timeline_rpc_test: Pass, RuntimeError # http://dartbug.com/31794
 [ $arch == simdbc64 && $compiler == dartk && $mode == debug ]
 eval_test: Pass, Slow
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 # Enabling of dartk for sim{arm,arm64,dbc64} revelaed these test failures, which
@@ -124,3 +124,4 @@ step_through_getter_test: RuntimeError # Debugging StringConcatenation doesn't w
 # Skip all service tests because random reloads interfere.
 [ $hot_reload || $hot_reload_rollback ]
 *: SkipByDesign # The service tests should run without being reloaded.
+
diff --git a/runtime/tests/vm/vm.status b/runtime/tests/vm/vm.status
index dcb48d1081f..16f935c1684 100644
--- a/runtime/tests/vm/vm.status
+++ b/runtime/tests/vm/vm.status
@@ -155,7 +155,7 @@ cc/Profiler_TypedArrayAllocation: Pass, Fail # Issue 31137
 [ $builder_tag == asan && $mode == debug && ($runtime == dart_precompiled || $runtime == vm) ]
 cc/Dart2JSCompileAll: SkipSlow # Timeout.
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 [ $compiler == dartk && $mode == debug && $runtime == vm ]
diff --git a/samples/samples.status b/samples/samples.status
index fa279fa89a6..f72813e00a3 100644
--- a/samples/samples.status
+++ b/samples/samples.status
@@ -22,7 +22,7 @@ build_dart: Skip
 build_dart_simple: Skip
 sample_extension: Skip
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 [ $compiler == dart2js && $runtime == none ]
diff --git a/tests/co19/co19-analyzer.status b/tests/co19/co19-analyzer.status
index 1cfafdbd84f..352cb5c52a4 100644
--- a/tests/co19/co19-analyzer.status
+++ b/tests/co19/co19-analyzer.status
@@ -55,7 +55,7 @@ Language/Expressions/Identifier_Reference/built_in_not_dynamic_t32: MissingCompi
 Language/Expressions/Identifier_Reference/evaluation_type_parameter_t02: MissingCompileTimeError # Please triage this failure.
 Language/Expressions/Instance_Creation/Const/abstract_class_t01/01: MissingCompileTimeError # Please triage this failure.
 Language/Expressions/Instance_Creation/Const/abstract_class_t03/01: MissingCompileTimeError # Please triage this failure.
-Language/Expressions/Instance_Creation/Const/arguments_t03: MissingCompileTimeError# Please triage this failure.
+Language/Expressions/Instance_Creation/Const/arguments_t03: MissingCompileTimeError # Please triage this failure.
 Language/Expressions/Lookup/Method_Lookup/superclass_t07: StaticWarning # Please triage this failure.
 Language/Expressions/Lookup/Method_Lookup/superclass_t08: StaticWarning # Please triage this failure.
 Language/Expressions/Maps/constant_map_t02: MissingCompileTimeError # Please triage this failure.
@@ -503,5 +503,6 @@ WebPlatformTest/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-007_t0
 WebPlatformTest/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-009_t01: StaticWarning # Please triage this failure.
 WebPlatformTest/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-011_t01: StaticWarning # Please triage this failure.
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
+
diff --git a/tests/compiler/dart2js_extra/dart2js_extra.status b/tests/compiler/dart2js_extra/dart2js_extra.status
index 441c6d55ccb..61e06194db0 100644
--- a/tests/compiler/dart2js_extra/dart2js_extra.status
+++ b/tests/compiler/dart2js_extra/dart2js_extra.status
@@ -23,7 +23,7 @@ timer_test: Fail # Issue 7728.
 [ $runtime == none ]
 timer_negative_test: Fail, OK # A negative runtime test.
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $strong && $compiler == dart2analyzer ]
 dummy_compiler_test: Skip # Issue 28649
 recursive_import_test: Skip # Issue 28649
 
diff --git a/tests/corelib/corelib.status b/tests/corelib/corelib.status
index 89ef6ed4f85..460a428fc2c 100644
--- a/tests/corelib/corelib.status
+++ b/tests/corelib/corelib.status
@@ -119,9 +119,6 @@ int_parse_radix_test/*: Pass, Slow
 [ $arch == x64 && $system == windows ]
 stopwatch_test: Skip # Flaky test due to expected performance behaviour.
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
-*: Skip # Issue 28649
-
 # Analyzer's implementation of fromEnvironment assumes that undefined
 # environment variables have an unspecified value (rather than being
 # null) because it is expected that the user will supply a value when
@@ -135,6 +132,9 @@ from_environment_const_type_undefined_test/13: CompileTimeError
 from_environment_const_type_undefined_test/14: CompileTimeError
 from_environment_const_type_undefined_test/16: CompileTimeError
 
+[ $compiler == dart2analyzer && $strong ]
+*: Skip # Issue 28649
+
 [ $compiler != dart2analyzer && $runtime != dart_precompiled && $runtime != vm ]
 data_resource_test: RuntimeError # Issue 23825 (not implemented yet).
 file_resource_test: Skip, OK # VM specific test, uses dart:io.
diff --git a/tests/html/html.status b/tests/html/html.status
index 1b449b0db70..a1a3013d08a 100644
--- a/tests/html/html.status
+++ b/tests/html/html.status
@@ -159,7 +159,7 @@ worker_api_test: Skip # Issue 13221
 [ $strong ]
 *: SkipByDesign
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 [ $compiler == dart2js && $runtime == chrome ]
diff --git a/tests/isolate/isolate.status b/tests/isolate/isolate.status
index 9ff8edb7353..1491b907d35 100644
--- a/tests/isolate/isolate.status
+++ b/tests/isolate/isolate.status
@@ -48,7 +48,7 @@ spawn_uri_multi_test/none: RuntimeError # Issue 13544
 [ $strong ]
 *: SkipByDesign
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 [ $compiler == dart2js && $runtime == chrome ]
diff --git a/tests/kernel/kernel.status b/tests/kernel/kernel.status
index 9c3de3655c9..7e1ba14b2d1 100644
--- a/tests/kernel/kernel.status
+++ b/tests/kernel/kernel.status
@@ -12,15 +12,15 @@ unsorted/super_mixin_test: CompileTimeError
 [ !$strong ]
 unsorted/invocation_errors_test: RuntimeError
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
-*: Skip # Issue 28649
-
 [ $compiler == dart2analyzer && $runtime == none ]
 unsorted/invocation_errors_test: StaticWarning
 unsorted/loop_test: CompileTimeError # int64
 unsorted/simple_literal_test: CompileTimeError # int64
 unsorted/super_mixin_test: CompileTimeError
 
+[ $compiler == dart2analyzer && $strong ]
+*: Skip # Issue 28649
+
 [ $compiler == dartk && $strong ]
 unsorted/invocation_errors_test: CompileTimeError
 unsorted/loop_test: RuntimeError
diff --git a/tests/language/language_analyzer2.status b/tests/language/language_analyzer2.status
index b567887f482..67463f959c1 100644
--- a/tests/language/language_analyzer2.status
+++ b/tests/language/language_analyzer2.status
@@ -398,9 +398,6 @@ vm/type_cast_vm_test: StaticWarning
 vm/type_vm_test: StaticWarning
 void_type_test: StaticWarning
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
-*: Skip # Issue 28649
-
 [ $compiler == dart2analyzer && $runtime == none ]
 arithmetic_test: CompileTimeError # int64
 bit_operations_test/01: CompileTimeError # int64
@@ -424,3 +421,6 @@ assertion_initializer_const_error2_test/none: Pass
 [ $compiler == dart2analyzer && $runtime == none && !$checked ]
 assertion_initializer_const_function_error_test/01: MissingCompileTimeError
 
+[ $compiler == dart2analyzer && $strong ]
+*: Skip # Issue 28649
+
diff --git a/tests/lib/analyzer/analyze_library.status b/tests/lib/analyzer/analyze_library.status
index 55060cfee5c..b3b42a84076 100644
--- a/tests/lib/analyzer/analyze_library.status
+++ b/tests/lib/analyzer/analyze_library.status
@@ -25,7 +25,7 @@ lib/web_gl/dartium/web_gl_dartium: Skip # TODO: Remove Dartium
 lib/web_sql/dart2js/web_sql_dart2js: CompileTimeError # Issue 16522
 lib/web_sql/dartium/web_sql_dartium: Skip # TODO: Remove Dartium
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 [ $compiler == dart2analyzer && $use_sdk ]
diff --git a/tests/lib/lib.status b/tests/lib/lib.status
index e6defdc67d6..df1ffd2a8b2 100644
--- a/tests/lib/lib.status
+++ b/tests/lib/lib.status
@@ -207,12 +207,12 @@ typed_data/setRange_2_test: Fail # Safari doesn't fully implement spec for Typed
 typed_data/setRange_3_test: Fail # Safari doesn't fully implement spec for TypedArray.set
 typed_data/setRange_4_test: Fail # Safari doesn't fully implement spec for TypedArray.set
 
-[ $builder_tag == strong && $compiler == dart2analyzer ]
-*: Skip # Issue 28649
-
 [ $compiler == dart2analyzer && $checked ]
 mirrors/regress_16321_test/01: MissingCompileTimeError # Issue 16391
 
+[ $compiler == dart2analyzer && $strong ]
+*: Skip # Issue 28649
+
 [ $compiler == dart2js && $mode == debug ]
 mirrors/native_class_test: Pass, Slow
 
diff --git a/tests/standalone/standalone.status b/tests/standalone/standalone.status
index 44429ad37eb..e96b188e640 100644
--- a/tests/standalone/standalone.status
+++ b/tests/standalone/standalone.status
@@ -30,7 +30,7 @@ verbose_gc_to_bmu_test: Skip
 [ $builder_tag == swarming && $system == macos ]
 io/*: Skip # Issue 30618
 
-[ $compiler == dart2analyzer && ($builder_tag == strong || $strong) ]
+[ $compiler == dart2analyzer && $strong ]
 *: Skip # Issue 28649
 
 [ $compiler == dartk && $strong ]