diff --git a/tests/language/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart b/tests/language/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
index f3f44736a34..c012c7708e6 100644
--- a/tests/language/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
+++ b/tests/language/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
@@ -6,9 +6,15 @@
 // There is an interface conflict here due to a loop in the class
 // hierarchy leading to an infinite set of implemented types; this loop
 // shouldn't cause non-termination.
-/*@compile-error=unspecified*/ class A<T> implements B<List<T>> {}
+class A<T> implements B<List<T>> {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
+// [cfe] 'A' is a supertype of itself.
 
-/*@compile-error=unspecified*/ class B<T> implements A<List<T>> {}
+class B<T> implements A<List<T>> {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
+// [cfe] 'B' is a supertype of itself.
 
 main() {
   new A();
diff --git a/tests/language/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart b/tests/language/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart
index e24aaa8daeb..b52630211b4 100644
--- a/tests/language/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart
+++ b/tests/language/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart
@@ -6,9 +6,15 @@
 // There is no interface conflict here, but there is a loop in the class
 // hierarchy leading to a finite set of implemented types; this loop
 // shouldn't cause non-termination.
-/*@compile-error=unspecified*/ class A<T> implements B<T> {}
+class A<T> implements B<T> {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
+// [cfe] 'A' is a supertype of itself.
 
-/*@compile-error=unspecified*/ class B<T> implements A<T> {}
+class B<T> implements A<T> {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
+// [cfe] 'B' is a supertype of itself.
 
 main() {
   new A();
diff --git a/tests/language/generic/conflicting_generic_interfaces_simple_test.dart b/tests/language/generic/conflicting_generic_interfaces_simple_test.dart
index fe319b2f0c1..59e97379a21 100644
--- a/tests/language/generic/conflicting_generic_interfaces_simple_test.dart
+++ b/tests/language/generic/conflicting_generic_interfaces_simple_test.dart
@@ -9,7 +9,10 @@ class A implements I<int> {}
 
 class B implements I<String> {}
 
-/*@compile-error=unspecified*/ class C extends A implements B {}
+class C extends A implements B {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.CONFLICTING_GENERIC_INTERFACES
+// [cfe] 'C' can't implement both 'I<int>' and 'I<String>'
 
 main() {
   new C();
diff --git a/tests/language/getter/unbound_test.dart b/tests/language/getter/unbound_test.dart
index 8eb2120995a..23adf3af775 100644
--- a/tests/language/getter/unbound_test.dart
+++ b/tests/language/getter/unbound_test.dart
@@ -6,7 +6,10 @@
 class A {
   const A();
   foo() {
-    return y; /*@compile-error=unspecified*/
+    return y;
+    //     ^
+    // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
+    // [cfe] The getter 'y' isn't defined for the class 'A'.
   }
 }
 
diff --git a/tests/language/import/transitive_private_library_access_test.dart b/tests/language/import/transitive_private_library_access_test.dart
index 9dcdaed3525..95f14dbd2be 100644
--- a/tests/language/import/transitive_private_library_access_test.dart
+++ b/tests/language/import/transitive_private_library_access_test.dart
@@ -9,5 +9,8 @@ import 'dart:typed_data';
 import 'package:expect/expect.dart';
 
 main() {
-  ClassID.GetID(4); /*@compile-error=unspecified*/
+  ClassID.GetID(4);
+//^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
+// [cfe] Undefined name 'ClassID'.
 }
diff --git a/tests/language/inference/circularity_test.dart b/tests/language/inference/circularity_test.dart
index f7d1db2a35e..76b039ca23d 100644
--- a/tests/language/inference/circularity_test.dart
+++ b/tests/language/inference/circularity_test.dart
@@ -2,8 +2,13 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-var /*@compile-error=unspecified*/ x = () => y;
-var /*@compile-error=unspecified*/ y = () => x;
+var x = () => y;
+//  ^
+// [analyzer] COMPILE_TIME_ERROR.TOP_LEVEL_CYCLE
+// [cfe] Can't infer the type of 'x': circularity found during type inference.
+var y = () => x;
+//  ^
+// [analyzer] COMPILE_TIME_ERROR.TOP_LEVEL_CYCLE
 
 void main() {
   x;
diff --git a/tests/language/initializing_formal/final_test.dart b/tests/language/initializing_formal/final_test.dart
index d08f6d273ef..13b9fd137fa 100644
--- a/tests/language/initializing_formal/final_test.dart
+++ b/tests/language/initializing_formal/final_test.dart
@@ -10,7 +10,10 @@ class A {
   // initializing formal.
   A(this.x)
       : y = (() {
-          /*@compile-error=unspecified*/ x = 3;
+          x = 3;
+//        ^
+// [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_LOCAL
+// [cfe] Can't assign to the final variable 'x'.
         });
 }
 
diff --git a/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart b/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
index 1be02363ac5..5aba1f1cca8 100644
--- a/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
+++ b/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
@@ -8,9 +8,15 @@
 // There is an interface conflict here due to a loop in the class
 // hierarchy leading to an infinite set of implemented types; this loop
 // shouldn't cause non-termination.
-/*@compile-error=unspecified*/ class A<T> implements B<List<T>> {}
+class A<T> implements B<List<T>> {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
+// [cfe] 'A' is a supertype of itself.
 
-/*@compile-error=unspecified*/ class B<T> implements A<List<T>> {}
+class B<T> implements A<List<T>> {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
+// [cfe] 'B' is a supertype of itself.
 
 main() {
   new A();
diff --git a/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart b/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart
index f5e7566e26e..59caff833e6 100644
--- a/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart
+++ b/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart
@@ -8,9 +8,15 @@
 // There is no interface conflict here, but there is a loop in the class
 // hierarchy leading to a finite set of implemented types; this loop
 // shouldn't cause non-termination.
-/*@compile-error=unspecified*/ class A<T> implements B<T> {}
+class A<T> implements B<T> {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
+// [cfe] 'A' is a supertype of itself.
 
-/*@compile-error=unspecified*/ class B<T> implements A<T> {}
+class B<T> implements A<T> {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
+// [cfe] 'B' is a supertype of itself.
 
 main() {
   new A();
diff --git a/tests/language_2/generic/conflicting_generic_interfaces_simple_test.dart b/tests/language_2/generic/conflicting_generic_interfaces_simple_test.dart
index b9b6108b5e1..b02cd265445 100644
--- a/tests/language_2/generic/conflicting_generic_interfaces_simple_test.dart
+++ b/tests/language_2/generic/conflicting_generic_interfaces_simple_test.dart
@@ -11,7 +11,10 @@ class A implements I<int> {}
 
 class B implements I<String> {}
 
-/*@compile-error=unspecified*/ class C extends A implements B {}
+class C extends A implements B {}
+//    ^
+// [analyzer] COMPILE_TIME_ERROR.CONFLICTING_GENERIC_INTERFACES
+// [cfe] 'C' can't implement both 'I<int>' and 'I<String>'
 
 main() {
   new C();
diff --git a/tests/language_2/getter/unbound_test.dart b/tests/language_2/getter/unbound_test.dart
index eb4d297c551..18e77cc570f 100644
--- a/tests/language_2/getter/unbound_test.dart
+++ b/tests/language_2/getter/unbound_test.dart
@@ -8,7 +8,10 @@
 class A {
   const A();
   foo() {
-    return y; /*@compile-error=unspecified*/
+    return y;
+    //     ^
+    // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
+    // [cfe] The getter 'y' isn't defined for the class 'A'.
   }
 }
 
diff --git a/tests/language_2/import/transitive_private_library_access_test.dart b/tests/language_2/import/transitive_private_library_access_test.dart
index 5f3e5ec93d5..3d0e1c908a9 100644
--- a/tests/language_2/import/transitive_private_library_access_test.dart
+++ b/tests/language_2/import/transitive_private_library_access_test.dart
@@ -11,5 +11,8 @@ import 'dart:typed_data';
 import 'package:expect/expect.dart';
 
 main() {
-  ClassID.GetID(4); /*@compile-error=unspecified*/
+  ClassID.GetID(4);
+//^^^^^^^
+// [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER
+// [cfe] Undefined name 'ClassID'.
 }
diff --git a/tests/language_2/inference/circularity_test.dart b/tests/language_2/inference/circularity_test.dart
index 9b502ee8f0c..5a6087c974e 100644
--- a/tests/language_2/inference/circularity_test.dart
+++ b/tests/language_2/inference/circularity_test.dart
@@ -4,8 +4,13 @@
 
 // @dart = 2.9
 
-var /*@compile-error=unspecified*/ x = () => y;
-var /*@compile-error=unspecified*/ y = () => x;
+var x = () => y;
+//  ^
+// [analyzer] COMPILE_TIME_ERROR.TOP_LEVEL_CYCLE
+// [cfe] Can't infer the type of 'x': circularity found during type inference.
+var y = () => x;
+//  ^
+// [analyzer] COMPILE_TIME_ERROR.TOP_LEVEL_CYCLE
 
 void main() {
   x;
diff --git a/tests/language_2/initializing_formal/final_test.dart b/tests/language_2/initializing_formal/final_test.dart
index 006393896f3..e780a89923b 100644
--- a/tests/language_2/initializing_formal/final_test.dart
+++ b/tests/language_2/initializing_formal/final_test.dart
@@ -12,7 +12,10 @@ class A {
   // initializing formal.
   A(this.x)
       : y = (() {
-          /*@compile-error=unspecified*/ x = 3;
+          x = 3;
+//        ^
+// [analyzer] COMPILE_TIME_ERROR.ASSIGNMENT_TO_FINAL_LOCAL
+// [cfe] Can't assign to the final variable 'x'.
         });
 }
 
diff --git a/tests/language_2/initializing_formal/type_test.dart b/tests/language_2/initializing_formal/type_test.dart
index 59f381fca66..aacb74157d2 100644
--- a/tests/language_2/initializing_formal/type_test.dart
+++ b/tests/language_2/initializing_formal/type_test.dart
@@ -12,7 +12,10 @@ class A {
   // Finding the type of an initializing formal: should cause an error
   // in the initializer but not the body, because the former has type
   // `int` and the latter has type `num`.
-  A(int this.x) : /*@compile-error=unspecified*/ y = x {
+  A(int this.x) : y = x {
+    //                ^
+    // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
+    // [cfe] A value of type 'int' can't be assigned to a variable of type 'double'.
     y = x;
   }
 }
diff --git a/tests/language_2/invalid_returns/async_invalid_return_05_test.dart b/tests/language_2/invalid_returns/async_invalid_return_05_test.dart
index bc42415ce44..63e7d93cf8c 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_05_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_05_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 int v = null;
 void test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_08_test.dart b/tests/language_2/invalid_returns/async_invalid_return_08_test.dart
index 2bef7b8cfa5..ef8ee9767e6 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_08_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_08_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Object v = null;
 void test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_11_test.dart b/tests/language_2/invalid_returns/async_invalid_return_11_test.dart
index 6cde58665f5..466ea780ffc 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_11_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_11_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<int> v = null;
 void test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_14_test.dart b/tests/language_2/invalid_returns/async_invalid_return_14_test.dart
index b3c547ab19d..b511d2752f8 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_14_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_14_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<int> v = null;
 void test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_17_test.dart b/tests/language_2/invalid_returns/async_invalid_return_17_test.dart
index d2fe89a5470..f932b310210 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_17_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_17_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<Object> v = null;
 void test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_20_test.dart b/tests/language_2/invalid_returns/async_invalid_return_20_test.dart
index 4d0d5a2373c..a085998e729 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_20_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_20_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<Object> v = null;
 void test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_23_test.dart b/tests/language_2/invalid_returns/async_invalid_return_23_test.dart
index 1702d660da4..80b9551d96d 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_23_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_23_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 Object test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_24_test.dart b/tests/language_2/invalid_returns/async_invalid_return_24_test.dart
index d6a0052e842..a5d411b93c9 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_24_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_24_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<void> v = null;
 Object test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_25_test.dart b/tests/language_2/invalid_returns/async_invalid_return_25_test.dart
index 2419225078c..5229529db09 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_25_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_25_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<void> v = null;
 Object test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_26_test.dart b/tests/language_2/invalid_returns/async_invalid_return_26_test.dart
index 633160cc503..304fb4e344d 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_26_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_26_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 Future<int> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_27_test.dart b/tests/language_2/invalid_returns/async_invalid_return_27_test.dart
index 8424d4a2e87..337e5adeff4 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_27_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_27_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<void> v = null;
 Future<int> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_28_test.dart b/tests/language_2/invalid_returns/async_invalid_return_28_test.dart
index 2966d060298..5458744606a 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_28_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_28_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<void> v = null;
 Future<int> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_29_test.dart b/tests/language_2/invalid_returns/async_invalid_return_29_test.dart
index 455a6836f2e..8babacffcaa 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_29_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_29_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 FutureOr<int> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_30_test.dart b/tests/language_2/invalid_returns/async_invalid_return_30_test.dart
index ae4100b62c8..28cb5883c2f 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_30_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_30_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<void> v = null;
 FutureOr<int> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_31_test.dart b/tests/language_2/invalid_returns/async_invalid_return_31_test.dart
index 94235678ccd..0c047ffdeee 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_31_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_31_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<void> v = null;
 FutureOr<int> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_32_test.dart b/tests/language_2/invalid_returns/async_invalid_return_32_test.dart
index 5f12002ed92..c3026bbdff3 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_32_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_32_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 Future<Object> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_33_test.dart b/tests/language_2/invalid_returns/async_invalid_return_33_test.dart
index 8d72f80b8e8..3081313d3c0 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_33_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_33_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<void> v = null;
 Future<Object> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_34_test.dart b/tests/language_2/invalid_returns/async_invalid_return_34_test.dart
index efbd26b41f1..ac370068ef9 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_34_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_34_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<void> v = null;
 Future<Object> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_35_test.dart b/tests/language_2/invalid_returns/async_invalid_return_35_test.dart
index 4e26ff0660c..f1e858072a8 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_35_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_35_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 FutureOr<Object> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_36_test.dart b/tests/language_2/invalid_returns/async_invalid_return_36_test.dart
index 2b711d01e62..59557a73783 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_36_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_36_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<void> v = null;
 FutureOr<Object> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_37_test.dart b/tests/language_2/invalid_returns/async_invalid_return_37_test.dart
index e9e9fd225f6..e67b6fa75a6 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_37_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_37_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<void> v = null;
 FutureOr<Object> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_38_test.dart b/tests/language_2/invalid_returns/async_invalid_return_38_test.dart
index 0a2f430acb7..836c9c2bd91 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_38_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_38_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 int v = null;
 Future<String> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_39_test.dart b/tests/language_2/invalid_returns/async_invalid_return_39_test.dart
index 594ce33dbd5..00496a99c14 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_39_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_39_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<int> v = null;
 Future<String> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_40_test.dart b/tests/language_2/invalid_returns/async_invalid_return_40_test.dart
index 9ddb98eb35a..3faea6c8474 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_40_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_40_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<int> v = null;
 Future<String> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_41_test.dart b/tests/language_2/invalid_returns/async_invalid_return_41_test.dart
index 5e7ec9f95a7..bbc742acf7b 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_41_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_41_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<Future<String>> v = null;
 Future<String> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<Future<String>>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_42_test.dart b/tests/language_2/invalid_returns/async_invalid_return_42_test.dart
index 260ee69f313..6e84244fa63 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_42_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_42_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 int v = null;
 FutureOr<String> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_43_test.dart b/tests/language_2/invalid_returns/async_invalid_return_43_test.dart
index 7db359f4ea8..e2aa1dab425 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_43_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_43_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<int> v = null;
 FutureOr<String> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_44_test.dart b/tests/language_2/invalid_returns/async_invalid_return_44_test.dart
index 0a1fef9aa99..fd0d1b2d5df 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_44_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_44_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<int> v = null;
 FutureOr<String> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/async_invalid_return_45_test.dart b/tests/language_2/invalid_returns/async_invalid_return_45_test.dart
index 378b550d489..f9e94d85213 100644
--- a/tests/language_2/invalid_returns/async_invalid_return_45_test.dart
+++ b/tests/language_2/invalid_returns/async_invalid_return_45_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<Future<String>> v = null;
 FutureOr<String> test() async {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<Future<String>>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_06_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_06_test.dart
index d652600d446..9d26ea7aafb 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_06_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_06_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 int v = null;
 void test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_07_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_07_test.dart
index 6d0d433621f..5d3c1663a61 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_07_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_07_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Object v = null;
 void test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_08_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_08_test.dart
index c6a5c42f805..6d79d3b65a8 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_08_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_08_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<int> v = null;
 void test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_09_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_09_test.dart
index 5520b0d5b94..85bf9373ed3 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_09_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_09_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<int> v = null;
 void test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_10_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_10_test.dart
index 7120b5a75ca..6195019fb9d 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_10_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_10_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<Object> v = null;
 void test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_11_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_11_test.dart
index 512d86cb33d..e426be93822 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_11_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_11_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<Object> v = null;
 void test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] Can't return a value from a void function.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_12_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_12_test.dart
index dccc9ab4ea5..9fbd3453bfd 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_12_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_12_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 int test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_13_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_13_test.dart
index 3f225d5d155..889e9863ab4 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_13_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_13_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 Object test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_14_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_14_test.dart
index f9b77455f4b..90efd31df7a 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_14_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_14_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 Future<int> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_15_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_15_test.dart
index 0aa4c78221d..8ee6a812725 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_15_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_15_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 FutureOr<int> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_16_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_16_test.dart
index 187e10154df..8bc773bb679 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_16_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_16_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 Future<Object> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_17_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_17_test.dart
index 2f4a20f9a1f..e5b4e8ffd3a 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_17_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_17_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 void v = null;
 FutureOr<Object> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] This expression has type 'void' and can't be used.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_18_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_18_test.dart
index 506919ddbb1..2b8637edd17 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_18_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_18_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 int v = null;
 String test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'int' can't be assigned to a variable of type 'String'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_19_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_19_test.dart
index d169b250bfd..d227e6419a2 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_19_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_19_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<int> v = null;
 String test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'String'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_20_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_20_test.dart
index da14cd8dca7..6664d4cc9e5 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_20_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_20_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<int> v = null;
 String test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'FutureOr<int>' can't be assigned to a variable of type 'String'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_21_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_21_test.dart
index 9b612c4fa6e..2f3d58486e9 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_21_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_21_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 int v = null;
 Future<String> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'int' can't be assigned to a variable of type 'Future<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_22_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_22_test.dart
index 623085917f2..3d3024c2b9b 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_22_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_22_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<int> v = null;
 Future<String> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'Future<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_23_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_23_test.dart
index 27fbed11436..3cca2693ff9 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_23_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_23_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<int> v = null;
 Future<String> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'FutureOr<int>' can't be assigned to a variable of type 'Future<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_24_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_24_test.dart
index 9eb5d64bf05..aa9eeab2a94 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_24_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_24_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 int v = null;
 FutureOr<String> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'int' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_25_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_25_test.dart
index 4a071732ae8..8744c10110b 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_25_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_25_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 Future<int> v = null;
 FutureOr<String> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'Future<int>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {
diff --git a/tests/language_2/invalid_returns/sync_invalid_return_26_test.dart b/tests/language_2/invalid_returns/sync_invalid_return_26_test.dart
index 92d2ac4a48f..2f220422945 100644
--- a/tests/language_2/invalid_returns/sync_invalid_return_26_test.dart
+++ b/tests/language_2/invalid_returns/sync_invalid_return_26_test.dart
@@ -12,7 +12,10 @@ import 'dart:async';
 */
 FutureOr<int> v = null;
 FutureOr<String> test() {
-  return /*@compile-error=unspecified*/ v;
+  return v;
+  //     ^
+  // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+  // [cfe] A value of type 'FutureOr<int>' can't be assigned to a variable of type 'FutureOr<String>'.
 }
 
 void main() {