diff --git a/tests/co19/co19-co19.status b/tests/co19/co19-co19.status
index 072f96a..0a66fd4 100644
--- a/tests/co19/co19-co19.status
+++ b/tests/co19/co19-co19.status
@@ -7,7 +7,40 @@
 #    https://github.com/dart-lang/co19/issues .
 
 # In order to qualify here these tests need to fail both on the VM and dart2js.
-### GENERAL FAILURES ###
+
+# Tests that produce compile-time errors even in legacy mode.
+[ $runtime == none ]
+Language/Variables/constant_initialization_t03: CompileTimeError # Uppercase constants removed
+Language/Variables/constant_variable_t09: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_GE_A01_t03: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_GE_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_GT_A01_t03: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_GT_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_LE_A01_t03: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_LE_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_LT_A01_t03: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_LT_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_addition_A01_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_addition_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_division_A01_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_division_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_multiplication_A01_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_multiplication_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_subtraction_A01_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_truncating_division_A01_t01: CompileTimeError # Uppercase constants removed
+LibTest/core/double/operator_truncating_division_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/isolate/SendPort/send_A01_t01: CompileTimeError # Uppercase constants removed
+LibTest/isolate/SendPort/send_A01_t02: CompileTimeError # Uppercase constants removed
+LibTest/isolate/SendPort/send_A01_t03: CompileTimeError # Uppercase constants removed
+LibTest/isolate/SendPort/send_A01_t04: CompileTimeError # Uppercase constants removed
+LibTest/math/MutableRectangle/operator_equality_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/math/MutableRectangle/operator_equality_A04_t01: CompileTimeError # Uppercase constants removed
+LibTest/math/Point/operator_equality_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/math/Point/operator_equality_A04_t01: CompileTimeError # Uppercase constants removed
+LibTest/math/Rectangle/operator_equality_A02_t01: CompileTimeError # Uppercase constants removed
+LibTest/math/Rectangle/operator_equality_A04_t01: CompileTimeError # Uppercase constants removed
+
+# Tests that fail either at compile-time or at runtime.
 [ $runtime != none ]
 Language/Expressions/Numbers/static_type_of_double_t01: RuntimeError # Uppercase constants removed
 Language/Expressions/Object_Identity/constant_objects_t01: RuntimeError # Uppercase constants removed
diff --git a/tests/corelib/corelib.status b/tests/corelib/corelib.status
index 6ee4753..7feb3b9 100644
--- a/tests/corelib/corelib.status
+++ b/tests/corelib/corelib.status
@@ -59,6 +59,10 @@
 string_case_test/01: RuntimeError # jsshell does not recognize character 223 aka \xdf
 unicode_test: RuntimeError # jsshell does not recognize character 223 aka \xdf
 
+[ $runtime == none ]
+iterable_contains_test: CompileTimeError # Uppercase constants removed.
+map_test: CompileTimeError # Uppercase constants removed.
+
 [ $runtime != none ]
 compare_to_test: RuntimeError # Uppercase constants removed.
 data_uri_test: RuntimeError # Uppercase constants removed.
diff --git a/tests/language_2/language_2_kernel.status b/tests/language_2/language_2_kernel.status
index 1b65936..ce4f8dd 100644
--- a/tests/language_2/language_2_kernel.status
+++ b/tests/language_2/language_2_kernel.status
@@ -2073,19 +2073,24 @@
 optional_named_parameters_test/09: MissingCompileTimeError
 override_field_test/01: MissingCompileTimeError
 override_inheritance_abstract_test/*: Skip # Tests Dart 2 semantics
+override_inheritance_field_test/04: MissingCompileTimeError
 override_inheritance_field_test/05: MissingCompileTimeError
+override_inheritance_field_test/06: MissingCompileTimeError
 override_inheritance_field_test/07: MissingCompileTimeError
 override_inheritance_field_test/08: MissingCompileTimeError
 override_inheritance_field_test/09: MissingCompileTimeError
 override_inheritance_field_test/10: MissingCompileTimeError
 override_inheritance_field_test/11: MissingCompileTimeError
+override_inheritance_field_test/26: MissingCompileTimeError
 override_inheritance_field_test/28: MissingCompileTimeError
+override_inheritance_field_test/29: MissingCompileTimeError
 override_inheritance_field_test/30: MissingCompileTimeError
 override_inheritance_field_test/31: MissingCompileTimeError
 override_inheritance_field_test/32: MissingCompileTimeError
 override_inheritance_field_test/33: MissingCompileTimeError
 override_inheritance_field_test/33a: MissingCompileTimeError
 override_inheritance_field_test/34: MissingCompileTimeError
+override_inheritance_generic_test/02: MissingCompileTimeError
 override_inheritance_generic_test/04: MissingCompileTimeError
 override_inheritance_generic_test/06: MissingCompileTimeError
 override_inheritance_generic_test/07: MissingCompileTimeError
@@ -2103,10 +2108,14 @@
 override_inheritance_method_test/20: MissingCompileTimeError
 override_inheritance_method_test/21: MissingCompileTimeError
 override_inheritance_method_test/27: MissingCompileTimeError
+override_inheritance_method_test/28: MissingCompileTimeError
+override_inheritance_method_test/29: MissingCompileTimeError
 override_inheritance_method_test/30: MissingCompileTimeError
 override_inheritance_method_test/31: MissingCompileTimeError
 override_inheritance_method_test/32: MissingCompileTimeError
 override_inheritance_method_test/33: MissingCompileTimeError
+override_inheritance_method_test/36: MissingCompileTimeError
+override_inheritance_method_test/39: MissingCompileTimeError
 override_method_with_field_test/02: MissingCompileTimeError
 part2_test/01: MissingCompileTimeError
 partial_tearoff_instantiation_test/01: MissingCompileTimeError
diff --git a/tests/lib/lib.status b/tests/lib/lib.status
index 8a14e57..335211e 100644
--- a/tests/lib/lib.status
+++ b/tests/lib/lib.status
@@ -144,6 +144,9 @@
 async/stream_event_transformed_test: Skip # Flutter Issue 9113
 mirrors/*: Skip # Flutter does not support mirrors.
 
+[ $runtime == none ]
+convert/html_escape_test: CompileTimeError # Uppercase constants removed
+
 [ $runtime != none ]
 async/stream_controller_async_test: RuntimeError # Library changed.
 async/stream_empty_test: RuntimeError # Uppercase constants removed