diff --git a/compiler/test-resources/repl/rewrite-messages b/compiler/test-resources/repl/rewrite-messages
index a63a72195019..393b87ee272b 100644
--- a/compiler/test-resources/repl/rewrite-messages
+++ b/compiler/test-resources/repl/rewrite-messages
@@ -1,17 +1,20 @@
 //> using options -source:future-migration -deprecation -Werror
 scala> import scala.util._
--- Error: ----------------------------------------------------------------------
+-- Migration Warning: ----------------------------------------------------------
 1 | import scala.util._
   |                   ^
   |         `_` is no longer supported for a wildcard import; use `*` instead
-
+No warnings can be incurred under -Werror.
+1 warning found
+1 error found
 scala> extension (x: Int) def foo(y: Int) = x + y
 def foo(x: Int)(y: Int): Int
-
 scala> 2 foo 4
--- Error: ----------------------------------------------------------------------
+-- Migration Warning: ----------------------------------------------------------
 1 | 2 foo 4
   |   ^^^
   |Alphanumeric method foo is not declared infix; it should not be used as infix operator.
   |Instead, use method syntax .foo(...) or backticked identifier `foo`.
-1 error found
+No warnings can be incurred under -Werror.
+1 warning found
+1 error found
\ No newline at end of file
diff --git a/tests/neg-macros/macro-deprecation.check b/tests/neg-macros/macro-deprecation.check
new file mode 100644
index 000000000000..2f259b79aa7e
--- /dev/null
+++ b/tests/neg-macros/macro-deprecation.check
@@ -0,0 +1 @@
+s
\ No newline at end of file
diff --git a/tests/patmat/i14407.dupe.check b/tests/patmat/i14407.dupe.check
index b0605bcd95e5..e6f742314d98 100644
--- a/tests/patmat/i14407.dupe.check
+++ b/tests/patmat/i14407.dupe.check
@@ -1 +1,2 @@
 6: Match case Unreachable
+0: No Kind
diff --git a/tests/patmat/i18118.check b/tests/patmat/i18118.check
index 8861eb273fb9..f7ad777f5e8c 100644
--- a/tests/patmat/i18118.check
+++ b/tests/patmat/i18118.check
@@ -2,3 +2,4 @@
 21: Pattern Match
 32: Pattern Match
 41: Pattern Match
+0: No Kind