diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5e6e65b6c15..1eba36dd8f8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gcc.target/i386/avx256-unaligned-load-2.c: Requre !ia32
+	instead of lp64.
+	* gcc.target/i386/avx256-unaligned-store-2.c: Likewise.
+	* gcc.target/i386/pr49715-2.c: Likewise.
+	* gcc.target/i386/retarg.c: Likewise.  Scan both %rdi and %edi.
+
 2012-11-13  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/55281
diff --git a/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c b/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c
index 3f4fbf76479..2947d9eab3e 100644
--- a/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c
@@ -1,5 +1,4 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-load" } */
 
 #define N 1024
diff --git a/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c b/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c
index e98d1b684de..977662beb34 100644
--- a/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c
@@ -1,5 +1,4 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store" } */
 
 #define N 1024
diff --git a/gcc/testsuite/gcc.target/i386/pr49715-2.c b/gcc/testsuite/gcc.target/i386/pr49715-2.c
index 3fc8e4e8df3..76d713790b6 100644
--- a/gcc/testsuite/gcc.target/i386/pr49715-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr49715-2.c
@@ -1,5 +1,4 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 double func(unsigned long long x)
diff --git a/gcc/testsuite/gcc.target/i386/retarg.c b/gcc/testsuite/gcc.target/i386/retarg.c
index 3af770d861e..a69b60feaf4 100644
--- a/gcc/testsuite/gcc.target/i386/retarg.c
+++ b/gcc/testsuite/gcc.target/i386/retarg.c
@@ -1,5 +1,4 @@
-/* { dg-require-effective-target lp64 } */
-/* { dg-do compile } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 #include <string.h>
@@ -10,4 +9,4 @@ void *p (void *x, void *y, int z)
   return x;
 }
 
-/* { dg-final { scan-assembler-not "%rdi" } } */
+/* { dg-final { scan-assembler-not "%\[re\]di" } } */