diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 930f3b97e81..7cec9a6ff19 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-08  Georg-Johann Lay  <avr@gjlay.de>
+
+	PR tree-optimization/51315
+	* gcc.c-torture/execute/20111208-1.c (int16_t): Use __INT16_TYPE__
+	for typedef.
+	(int32_t): Use __INT32_TYPE__ for typedef.
+
 2011-12-08  Georg-Johann Lay  <avr@gjlay.de>
 
 	PR tree-optimization/51315
diff --git a/gcc/testsuite/gcc.c-torture/execute/20111208-1.c b/gcc/testsuite/gcc.c-torture/execute/20111208-1.c
index 31426a3279a..dc2b9ca8c86 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20111208-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20111208-1.c
@@ -10,26 +10,8 @@ extern void *memcpy (void *__restrict __dest,
 extern size_t strlen (__const char *__s)
      __attribute__ ((__nothrow__)) __attribute__ ((__pure__)) __attribute__ ((__nonnull__ (1)));
 
-#if __SIZEOF_SHORT__ == 2
-typedef short int int16_t;
-#elif __SIZEOF_INT__ == 2
-typedef int int16_t;
-#elif __SIZEOF_LONG__ == 2
-typedef long int16_t;
-#else
-#error Fix this
-#endif
-
-
-#if __SIZEOF_INT__ == 4
-typedef int int32_t;
-#elif __SIZEOF_LONG__ == 4
-typedef long int32_t;
-#elif __SIZEOF_SHORT__ == 4
-typedef short int32_t;
-#else
-#error Fix this
-#endif
+typedef __INT16_TYPE__ int16_t;
+typedef __INT32_TYPE__ int32_t;
 
 extern void abort (void);