diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e7ab4df302..ccaae0cbf9a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-23  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
+
+	* gcc.c-torture/execute/pr40404.c: Use long for bitfield on 16bit
+	int targets.
+
 2009-11-23  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
 
 	* gcc-dg/Wtype-limits.c: Add line to correct line numbers.
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr40404.c b/gcc/testsuite/gcc.c-torture/execute/pr40404.c
index a759a3f5c7d..b2e0ea2755c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr40404.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr40404.c
@@ -1,7 +1,14 @@
 extern void abort (void);
+
+#if (__SIZEOF_INT__ <= 2)
+struct S {
+  unsigned long ui17 : 17;
+} s;
+#else
 struct S {
   unsigned int ui17 : 17;
 } s;
+#endif
 int main()
 {
   s.ui17 = 0x1ffff;