diff --git a/tests/language/mixin/cyclic_test.dart b/tests/language/mixin/cyclic_test.dart
index 32689a37c04..1d3a4cf1c1a 100644
--- a/tests/language/mixin/cyclic_test.dart
+++ b/tests/language/mixin/cyclic_test.dart
@@ -16,7 +16,7 @@ class C2 = S with C2;
 // [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
 // [cfe] 'C2' is a supertype of itself.
 //                ^^
-// [analyzer] COMPILE_TIME_ERROR.MIXIN_INHERITS_FROM_NOT_OBJECT
+// [analyzer] COMPILE_TIME_ERROR.CLASS_USED_AS_MIXIN
 class C3 = S with M implements A;
 class C4 = S with M implements C4;
 //    ^^
diff --git a/tests/language/mixin/illegal_cycles_test.dart b/tests/language/mixin/illegal_cycles_test.dart
index efad84449f6..1d77e8dba2c 100644
--- a/tests/language/mixin/illegal_cycles_test.dart
+++ b/tests/language/mixin/illegal_cycles_test.dart
@@ -11,8 +11,6 @@ mixin class M0 extends Object with M0 {}
 // [cfe] 'Object with M0' is a supertype of itself.
 //                            ^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.MIXIN_CLASS_DECLARATION_EXTENDS_NOT_OBJECT
-//                                 ^^
-// [analyzer] COMPILE_TIME_ERROR.MIXIN_INHERITS_FROM_NOT_OBJECT
 
 mixin class M1 = Object with M1;
 //          ^^
@@ -48,8 +46,6 @@ mixin class M7 extends Object with M8 {}
 // [cfe] 'Object with M8' is a supertype of itself.
 //                            ^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.MIXIN_CLASS_DECLARATION_EXTENDS_NOT_OBJECT
-//                                 ^^
-// [analyzer] COMPILE_TIME_ERROR.MIXIN_INHERITS_FROM_NOT_OBJECT
 
 mixin class M8 extends Object with M7 {}
 //          ^^
@@ -58,8 +54,6 @@ mixin class M8 extends Object with M7 {}
 // [cfe] 'Object with M7' is a supertype of itself.
 //                            ^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.MIXIN_CLASS_DECLARATION_EXTENDS_NOT_OBJECT
-//                                 ^^
-// [analyzer] COMPILE_TIME_ERROR.MIXIN_INHERITS_FROM_NOT_OBJECT
 
 class M9 = Object with M91;
 //    ^
diff --git a/tests/language/mixin_legacy/cyclic_test.dart b/tests/language/mixin_legacy/cyclic_test.dart
index a318358ebb1..8263cc7c0f7 100644
--- a/tests/language/mixin_legacy/cyclic_test.dart
+++ b/tests/language/mixin_legacy/cyclic_test.dart
@@ -17,8 +17,7 @@ class C2 = S with C2;
 //    ^^
 // [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
 // [cfe] 'C2' is a supertype of itself.
-//                ^^
-// [analyzer] COMPILE_TIME_ERROR.MIXIN_INHERITS_FROM_NOT_OBJECT
+
 class C3 = S with M implements A;
 class C4 = S with M implements C4;
 //    ^^
diff --git a/tests/language/mixin_legacy/illegal_cycles_test.dart b/tests/language/mixin_legacy/illegal_cycles_test.dart
index ed44493b7c5..0c35f0f830c 100644
--- a/tests/language/mixin_legacy/illegal_cycles_test.dart
+++ b/tests/language/mixin_legacy/illegal_cycles_test.dart
@@ -11,8 +11,6 @@ class M0 extends Object with M0 {}
 // [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
 // [cfe] 'M0' is a supertype of itself.
 // [cfe] 'Object with M0' is a supertype of itself.
-//                           ^^
-// [analyzer] COMPILE_TIME_ERROR.MIXIN_INHERITS_FROM_NOT_OBJECT
 
 class M1 = Object with M1;
 //    ^^
@@ -46,16 +44,12 @@ class M7 extends Object with M8 {}
 // [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
 // [cfe] 'M7' is a supertype of itself.
 // [cfe] 'Object with M8' is a supertype of itself.
-//                           ^^
-// [analyzer] COMPILE_TIME_ERROR.MIXIN_INHERITS_FROM_NOT_OBJECT
 
 class M8 extends Object with M7 {}
 //    ^^
 // [analyzer] COMPILE_TIME_ERROR.RECURSIVE_INTERFACE_INHERITANCE
 // [cfe] 'M8' is a supertype of itself.
 // [cfe] 'Object with M7' is a supertype of itself.
-//                           ^^
-// [analyzer] COMPILE_TIME_ERROR.MIXIN_INHERITS_FROM_NOT_OBJECT
 
 class M9 = Object with M91;
 //    ^