diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 389dfd4f56039b4b0e22eaa17c937b3fc39b074b..7d7c8034efc7e932b14da1ee85e540fd46da5697 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-02  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/avx-cvt-2.c (dg-options): Add -mtune=generic.
+	* gcc.target/i386/avx2-cvt-2.c (dg-options): Ditto.
+	* gcc.target/i386/sse2-cvt-2.c (dg-options): Ditto.
+
+	* gcc.target/i386/vectorize4-avx.c (dg-final): Remove xfail *-*-*.
+
 2011-11-02  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/50902
@@ -85,7 +93,7 @@
 2011-10-28  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	Revert:
-        2011-10-28  Paolo Carlini  <paolo.carlini@oracle.com>
+	2011-10-28  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/50864
 	* g++.dg/template/crash109.C: New.
diff --git a/gcc/testsuite/gcc.target/i386/avx-cvt-2.c b/gcc/testsuite/gcc.target/i386/avx-cvt-2.c
index 78c6398f341071e15f69d5e397d5260c5a010346..68206f5a0e7f9ec61bc52afc656659d6b216550a 100644
--- a/gcc/testsuite/gcc.target/i386/avx-cvt-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-cvt-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -mavx -mno-avx2 -fdump-tree-vect-details" } */
+/* { dg-options "-O3 -mavx -mno-avx2 -mtune=generic -fdump-tree-vect-details" } */
 
 #include "avx-cvt-1.c"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx2-cvt-2.c b/gcc/testsuite/gcc.target/i386/avx2-cvt-2.c
index 288e5601a462213d7e83177e3518a85c51c47a1f..4826e9b6d05d95e1596fc1498c0304db699eb9ae 100644
--- a/gcc/testsuite/gcc.target/i386/avx2-cvt-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx2-cvt-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -mavx2 -fdump-tree-vect-details" } */
+/* { dg-options "-O3 -mavx2 -mtune=generic -fdump-tree-vect-details" } */
 
 #include "avx2-cvt-1.c"
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-cvt-2.c b/gcc/testsuite/gcc.target/i386/sse2-cvt-2.c
index 9c4519544ca5b91545180d9ee4fe4d2e5ad2920f..00f13254c2205bbd40ae35e53f94ce39a15519d5 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-cvt-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-cvt-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -msse2 -mno-sse3 -fdump-tree-vect-details" } */
+/* { dg-options "-O3 -msse2 -mno-sse3 -mtune=generic -fdump-tree-vect-details" } */
 
 #include "sse2-cvt-1.c"
 
diff --git a/gcc/testsuite/gcc.target/i386/vectorize4-avx.c b/gcc/testsuite/gcc.target/i386/vectorize4-avx.c
index 8e4a747a64b27fdc7d56340912e16af3ed908aad..33e99189373a405b07637eb63f34f394057309e3 100644
--- a/gcc/testsuite/gcc.target/i386/vectorize4-avx.c
+++ b/gcc/testsuite/gcc.target/i386/vectorize4-avx.c
@@ -11,4 +11,4 @@ calc_freq (int *dest)
     dest[i] = sqrt (tmp_out[i]);
 }
 
-/* { dg-final { scan-assembler "vsqrtpd\[ \\t\]+\[^\n\]*%ymm" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler "vsqrtpd\[ \\t\]+\[^\n\]*%ymm" } } */