diff --git a/gcc/testsuite/gcc.dg/pr123109-scalar.c 
b/gcc/testsuite/gcc.dg/pr123109-scalar.c
index dda903a2cee..138cbd7ca0b 100644
--- a/gcc/testsuite/gcc.dg/pr123109-scalar.c
+++ b/gcc/testsuite/gcc.dg/pr123109-scalar.c
@@ -7,10 +7,10 @@
  #define TEST_EQ(type)                                         \
    type test_eq_##type (type a) { return (a >> 31) == 0; }

-TEST_NE(int)
-TEST_NE(unsigned)
-TEST_EQ(int)
-TEST_EQ(unsigned)
+TEST_NE(__INT32_TYPE__)
+TEST_NE(__UINT32_TYPE__)
+TEST_EQ(__INT32_TYPE__)
+TEST_EQ(__UINT32_TYPE__)

  /* { dg-final { scan-tree-dump-times ">= 0" 2 optimized } } */
  /* { dg-final { scan-tree-dump-times "< 0" 2 optimized } } */
diff --git a/gcc/testsuite/gcc.dg/pr123109-vector.c 
b/gcc/testsuite/gcc.dg/pr123109-vector.c
index 35a0f2eff62..19e944fe30b 100644
--- a/gcc/testsuite/gcc.dg/pr123109-vector.c
+++ b/gcc/testsuite/gcc.dg/pr123109-vector.c
@@ -2,8 +2,8 @@
  /* { dg-options "-Wno-psabi -O2 -fdump-tree-forwprop2" } */
  /* { dg-additional-options "-msse2" { target { i?86-*-* x86_64-*-* } } 
} */

-typedef int v4si __attribute__((vector_size(4 * sizeof(int))));
-typedef unsigned int v4usi __attribute__((vector_size(4 * 
sizeof(unsigned int))));
+typedef __INT32_TYPE__ v4si __attribute__((vector_size(4 * 
sizeof(__INT32_TYPE__))));
+typedef __UINT32_TYPE__ v4usi __attribute__((vector_size(4 *