diff --git a/pkg/test_runner/lib/src/multitest.dart b/pkg/test_runner/lib/src/multitest.dart
index 7cd62eb7fce..a194c7347af 100644
--- a/pkg/test_runner/lib/src/multitest.dart
+++ b/pkg/test_runner/lib/src/multitest.dart
@@ -83,10 +83,7 @@ final _multitestOutcomes = {
   'syntax error',
   'compile-time error',
   'runtime error',
-  // TODO(rnystrom): Remove these after Dart 1.0 tests are removed.
-  'static type warning', // This is still a valid analyzer test
-  'dynamic type error', // This is now a no-op
-  'checked mode compile-time error' // This is now a no-op
+  'static type warning', // Used by some analyzer tests.
 };
 
 void _generateTestsFromMultitest(Path filePath, Map<String, String> tests,
diff --git a/tests/language/deferred/constraints_type_annotation_test.dart b/tests/language/deferred/constraints_type_annotation_test.dart
index 9d86ccbc32c..84310934548 100644
--- a/tests/language/deferred/constraints_type_annotation_test.dart
+++ b/tests/language/deferred/constraints_type_annotation_test.dart
@@ -22,11 +22,11 @@ main() {
   lib2.C a1 = new lib2.C(); //# type_annotation_non_deferred: continued
   asyncStart();
   lib.loadLibrary().then((_) {
-    lib.C a2 = new lib.C(); //# type_annotation1: dynamic type error, compile-time error
-    lib.G<F> a3 = new lib.G<F>(); //# type_annotation_generic1: dynamic type error, compile-time error
+    lib.C a2 = new lib.C(); //# type_annotation1: compile-time error
+    lib.G<F> a3 = new lib.G<F>(); //# type_annotation_generic1: compile-time error
     G2<lib.C> a4 = new G2(); //# type_annotation_generic2: compile-time error
     G2<lib.C> a5 = new G2<lib.C>(); //# type_annotation_generic3: compile-time error
-    lib.G<lib.C> a = new lib.G<lib.C>(); //# type_annotation_generic4: dynamic type error, compile-time error
+    lib.G<lib.C> a = new lib.G<lib.C>(); //# type_annotation_generic4: compile-time error
     var a6 = new lib.C(); //# new: ok
     var g1 = new lib.G<F>(); //# new_generic1: ok
     // new G2<lib.C>() does not give a dynamic type error because a malformed
diff --git a/tests/language/factory/factory1_test.dart b/tests/language/factory/factory1_test.dart
index d29187b3ac9..18302b01670 100644
--- a/tests/language/factory/factory1_test.dart
+++ b/tests/language/factory/factory1_test.dart
@@ -6,7 +6,11 @@
 class A<T> {
   A() {}
   factory A.factory() {
-    return new A<String>(); // //# 00: compile-time error
+    return new A<String>();
+    //     ^^^^^^^^^^^^^^^
+    // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+    //         ^
+    // [cfe] A value of type 'A<String>' can't be returned from a function with return type 'A<T>'.
     return A<T>();
   }
 }
@@ -14,14 +18,18 @@ class A<T> {
 class B<T> extends A<T> {
   B() {}
   factory B.factory() {
-    return new B<String>(); // //# 01: compile-time error
+    return new B<String>();
+    //     ^^^^^^^^^^^^^^^
+    // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+    //         ^
+    // [cfe] A value of type 'B<String>' can't be returned from a function with return type 'B<T>'.
     return B<T>();
   }
 }
 
 main() {
   new A<String>.factory();
-  new A<int>.factory(); // //# 00: dynamic type error
+  new A<int>.factory();
   new B<String>.factory();
-  new B<int>.factory(); // //# 01: dynamic type error
+  new B<int>.factory();
 }
diff --git a/tests/language_2/deferred/constraints_type_annotation_test.dart b/tests/language_2/deferred/constraints_type_annotation_test.dart
index d155d142f22..bb620b8f46f 100644
--- a/tests/language_2/deferred/constraints_type_annotation_test.dart
+++ b/tests/language_2/deferred/constraints_type_annotation_test.dart
@@ -24,11 +24,11 @@ main() {
   lib2.C a1 = new lib2.C(); //# type_annotation_non_deferred: continued
   asyncStart();
   lib.loadLibrary().then((_) {
-    lib.C a2 = new lib.C(); //# type_annotation1: dynamic type error, compile-time error
-    lib.G<F> a3 = new lib.G<F>(); //# type_annotation_generic1: dynamic type error, compile-time error
+    lib.C a2 = new lib.C(); //# type_annotation1: compile-time error
+    lib.G<F> a3 = new lib.G<F>(); //# type_annotation_generic1: compile-time error
     G2<lib.C> a4 = new G2(); //# type_annotation_generic2: compile-time error
     G2<lib.C> a5 = new G2<lib.C>(); //# type_annotation_generic3: compile-time error
-    lib.G<lib.C> a = new lib.G<lib.C>(); //# type_annotation_generic4: dynamic type error, compile-time error
+    lib.G<lib.C> a = new lib.G<lib.C>(); //# type_annotation_generic4: compile-time error
     var a6 = new lib.C(); //# new: ok
     var g1 = new lib.G<F>(); //# new_generic1: ok
     // new G2<lib.C>() does not give a dynamic type error because a malformed
diff --git a/tests/language_2/factory/factory1_test.dart b/tests/language_2/factory/factory1_test.dart
index d8b1dd7c97e..bac0e9418ac 100644
--- a/tests/language_2/factory/factory1_test.dart
+++ b/tests/language_2/factory/factory1_test.dart
@@ -8,20 +8,28 @@
 class A<T> {
   A() {}
   factory A.factory() {
-    return new A<String>(); // //# 00: compile-time error
+    return new A<String>();
+    //     ^^^^^^^^^^^^^^^
+    // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+    //         ^
+    // [cfe] A value of type 'A<String>' can't be assigned to a variable of type 'A<T>'.
   }
 }
 
 class B<T> extends A<T> {
   B() {}
   factory B.factory() {
-    return new B<String>(); // //# 01: compile-time error
+    return new B<String>();
+    //     ^^^^^^^^^^^^^^^
+    // [analyzer] COMPILE_TIME_ERROR.RETURN_OF_INVALID_TYPE
+    //         ^
+    // [cfe] A value of type 'B<String>' can't be assigned to a variable of type 'B<T>'.
   }
 }
 
 main() {
   new A<String>.factory();
-  new A<int>.factory(); // //# 00: dynamic type error
+  new A<int>.factory();
   new B<String>.factory();
-  new B<int>.factory(); // //# 01: dynamic type error
+  new B<int>.factory();
 }