diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e29aa6e78990..eac71e9ac63d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-09  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gcc.dg/Wpadded.c: Gate alignment warning on ! default_packed.
+	Fix typo in comment.
+
 2006-01-09  Feng Wang  <fengwang@nudt.edu.cn>
 
 	* gfortran.dg/single_char_string.f90: New test.
diff --git a/gcc/testsuite/gcc.dg/Wpadded.c b/gcc/testsuite/gcc.dg/Wpadded.c
index e55fd113f757..9e69a9fef50f 100644
--- a/gcc/testsuite/gcc.dg/Wpadded.c
+++ b/gcc/testsuite/gcc.dg/Wpadded.c
@@ -2,10 +2,12 @@
 
 /* { dg-do compile } */
 /* -fpack-struct is necessary because the warning expected requires the initial
-   packing to be larger than 1, which cannot ge guaranteed for all targets. */
+   packing to be larger than 1, which cannot be guaranteed for all targets.
+   We won't get a warning anyway if the target has "packed" structure
+   layout.  */
 /* { dg-options "-Wpadded -fpack-struct=8" } */
 
 struct foo {
   char bar;
-  long baz;                   /* { dg-warning "padding struct to align" } */
+  long baz; /* { dg-warning "padding struct to align" ""  { target { ! default_packed } } } */
 } futz;