--- a/gcc/testsuite/gcc.dg/uninit-15.c	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/testsuite/gcc.dg/uninit-15.c	Thu Oct 25 07:37:49 2018 +0900
@@ -3,14 +3,14 @@
    line 11, which is very confusing.  Make sure we print out a note to
    make it less confusing.  (not xfailed alternative)
    But it is of course ok if we warn in bar about uninitialized use
-   of j.  (xfailed alternative)  */
+   of j.  (not xfailed alternative)  */
 /* { dg-do compile } */
 /* { dg-options "-O1 -Wuninitialized" } */
 
 inline int
 foo (int i)
 {
-  if (i) /* { dg-warning "used uninitialized in this function" } */
+  if (i) /* { dg-warning "used uninitialized in this function" "" } */
     return 1;
   return 0;
 }
@@ -20,7 +20,7 @@
 void
 bar (void)
 {
-  int j; /* { dg-message "note: 'j' was declared here" } */
+  int j; /* { dg-message "note: 'j' was declared here" "" } */
   for (; foo (j); ++j)  /* { dg-warning "'j' is used uninitialized" "" { xfail *-*-* } } */
     baz ();
 }