diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 21628f8b250..c49acf37888 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/compat/struct-layout-1_test.h: Decrease bitfield size
+	to work even with -fshort-enums.
+
 2011-09-04  Jan Hubicka  <jh@suse.cz>
 
 	* gcc.c-torture/compile/20110902.c: new testcase.
diff --git a/gcc/testsuite/gcc.dg/compat/struct-layout-1_test.h b/gcc/testsuite/gcc.dg/compat/struct-layout-1_test.h
index 4a70dfd0601..affddcaefa8 100644
--- a/gcc/testsuite/gcc.dg/compat/struct-layout-1_test.h
+++ b/gcc/testsuite/gcc.dg/compat/struct-layout-1_test.h
@@ -1,5 +1 @@
-#if (__SIZEOF_INT__ >= 4) 
-T(0,enum E2 a:31;,B(0,a,e2_m1,e2_0))
-#else
-T(0,enum E2 a:15;,B(0,a,e2_m1,e2_0))
-#endif
+T(0,enum E2 a:7;,B(0,a,e2_m1,e2_0))