diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 6f1ad28586d..f9df8a74c5b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -2330,7 +2330,7 @@ public class ClassReader {
         } catch (CompletionFailure ex) {
             JavaFileObject prev = log.useSource(currentClassFile);
             try {
-                log.error(Errors.CantAttachTypeAnnotations(attributes, s.owner, s.name, ex.getDetailValue()));
+                log.warning(Warnings.CantAttachTypeAnnotations(attributes, s.owner, s.name, ex.getDetailValue()));
             } finally {
                 log.useSource(prev);
             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index a226b2f5960..acf8c696022 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2465,7 +2465,7 @@ compiler.warn.annotation.method.not.found.reason=\
     Cannot find annotation method ''{1}()'' in type ''{0}'': {2}
 
 # 0: list of annotation, 1: symbol, 2: name, 3: message segment
-compiler.err.cant.attach.type.annotations=\
+compiler.warn.cant.attach.type.annotations=\
     Cannot attach type annotations {0} to {1}.{2}:\n\
     {3}
 
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java b/test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java
index 11b4e1ccbd4..45fb843192e 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8337998
+ * @bug 8337998 8370800
  * @summary CompletionFailure in getEnclosingType attaching type annotations
  * @library /tools/javac/lib /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -74,13 +74,14 @@ public class CompletionErrorOnEnclosingType {
         tb.createDirectories(out);
         new JavacTask(tb).outdir(out).files(tb.findJavaFiles(src)).run();
 
-        // now if we remove A.class there will be an error but javac should not crash
+        // now if we remove A.class javac should not crash
         tb.deleteFiles(out.resolve("A.class"));
+
         List<String> log =
                 new JavacTask(tb)
                         .outdir(out)
                         .classpath(out)
-                        .options("-XDrawDiagnostics")
+                        .options("-Werror", "-XDrawDiagnostics")
                         .files(src.resolve("C.java"))
                         .run(Expect.FAIL)
                         .writeAll()
@@ -88,9 +89,11 @@ public class CompletionErrorOnEnclosingType {
 
         var expectedOutput =
                 List.of(
-                        "B.class:-:-: compiler.err.cant.attach.type.annotations: @Anno, B, a,"
-                            + " (compiler.misc.class.file.not.found: A)",
-                        "1 error");
+                        "B.class:-:-: compiler.warn.cant.attach.type.annotations: @Anno, B, a,"
+                                + " (compiler.misc.class.file.not.found: A)",
+                        "- compiler.err.warnings.and.werror",
+                        "1 error",
+                        "1 warning");
         if (!expectedOutput.equals(log)) {
             throw new Exception("expected output not found: " + log);
         }