diff --git a/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart b/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart
index b0b538a..f89ae90 100644
--- a/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart
+++ b/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart
@@ -779,13 +779,6 @@
 
   @override
   @failingTest
-  test_finalNotInitialized_local_const() async {
-    // Expected 1 errors of type CompileTimeErrorCode.CONST_NOT_INITIALIZED, found 0
-    await super.test_finalNotInitialized_local_const();
-  }
-
-  @override
-  @failingTest
   test_fromEnvironment_bool_badArgs() async {
     // Expected 2 errors of type CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION, found 0;
     //          2 errors of type StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE, found 0
diff --git a/pkg/analyzer/test/generated/static_warning_code_kernel_test.dart b/pkg/analyzer/test/generated/static_warning_code_kernel_test.dart
index 1b6e687..f08be6a 100644
--- a/pkg/analyzer/test/generated/static_warning_code_kernel_test.dart
+++ b/pkg/analyzer/test/generated/static_warning_code_kernel_test.dart
@@ -569,13 +569,6 @@
 
   @override
   @failingTest
-  @potentialAnalyzerProblem
-  test_finalNotInitialized_local_final() async {
-    return super.test_finalNotInitialized_local_final();
-  }
-
-  @override
-  @failingTest
   test_generalizedVoid_invocationOfVoidFieldError() async {
     return super.test_generalizedVoid_invocationOfVoidFieldError();
   }
diff --git a/pkg/analyzer_cli/test/driver_test.dart b/pkg/analyzer_cli/test/driver_test.dart
index e832287..ac524f9 100644
--- a/pkg/analyzer_cli/test/driver_test.dart
+++ b/pkg/analyzer_cli/test/driver_test.dart
@@ -692,14 +692,6 @@
 class ExitCodesTest_UseCFE extends ExitCodesTest {
   @override
   bool get useCFE => true;
-
-  @override
-  @failingTest
-  test_fatalWarnings() => callFailingTest(super.test_fatalWarnings);
-
-  @override
-  @failingTest
-  test_notFatalWarnings() => callFailingTest(super.test_notFatalWarnings);
 }
 
 @reflectiveTest
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
index fb42b80..a3f705e 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -1810,10 +1810,16 @@
       // one variable it must be followed by `in`.
       if (isConst) {
         initializer = deprecated_buildCompileTimeError(
-            "A 'const' variable must be initialized.", token.charOffset);
+            null,
+            token.charOffset,
+            fasta.templateConstFieldWithoutInitializer
+                .withArguments(token.lexeme));
       } else if (isFinal) {
         initializer = deprecated_buildCompileTimeError(
-            "A 'final' variable must be initialized.", token.charOffset);
+            null,
+            token.charOffset,
+            fasta.templateFinalFieldWithoutInitializer
+                .withArguments(token.lexeme));
       }
     }
     pushNewLocalVariable(initializer);