diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3fc91620fa9..8327d6ca027 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-16  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/pr36246.c: Add -fomit-frame-pointer to dg-options.
+	* gcc.target/i386/pr32661-1.c: Ditto.
+	* gcc.target/i386/pr34256.c: Ditto.
+	* gcc.target/i386/pr22076.c: Ditto. Check for "movl" instruction on
+	nonpic targets only.
+
 2008-11-16  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/38119
@@ -11,8 +19,8 @@
 
 2008-11-15  Paul Thomas  <pault@gcc.gnu.org>
 
-        PR fortran/37926
-        * gfortran.dg/dummy_procedure_3.f90: New test.
+	PR fortran/37926
+	* gfortran.dg/dummy_procedure_3.f90: New test.
 
 2008-11-15  Jakub Jelinek  <jakub@redhat.com>
 
diff --git a/gcc/testsuite/gcc.target/i386/pr22076.c b/gcc/testsuite/gcc.target/i386/pr22076.c
index de3e8e81931..5195f361c25 100644
--- a/gcc/testsuite/gcc.target/i386/pr22076.c
+++ b/gcc/testsuite/gcc.target/i386/pr22076.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -flax-vector-conversions -mmmx" } */
+/* { dg-options "-O2 -fomit-frame-pointer -flax-vector-conversions -mmmx" } */
 
 #include <mmintrin.h>
 
@@ -15,5 +15,4 @@ __v8qi test ()
 }
 
 /* { dg-final { scan-assembler-times "movq" 3 } } */
-/* { dg-final { scan-assembler-times "movl" 1 { target { ilp32 && nonpic } } } } */
-/* { dg-final { scan-assembler-times "movl" 2 { target { ilp32 && { ! nonpic } } } } } */
+/* { dg-final { scan-assembler-not "movl" { target nonpic } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr32661-1.c b/gcc/testsuite/gcc.target/i386/pr32661-1.c
index 068c8618032..9411c28872a 100644
--- a/gcc/testsuite/gcc.target/i386/pr32661-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr32661-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2 -fomit-frame-pointer" } */
 
 typedef long long __m128i __attribute__ ((__vector_size__ (16)));
 
diff --git a/gcc/testsuite/gcc.target/i386/pr34256.c b/gcc/testsuite/gcc.target/i386/pr34256.c
index 59afdfc1022..e207ecef7c3 100644
--- a/gcc/testsuite/gcc.target/i386/pr34256.c
+++ b/gcc/testsuite/gcc.target/i386/pr34256.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-O2 -march=core2" } */
+/* { dg-options "-O2 -fomit-frame-pointer -march=core2" } */
 
 #include <mmintrin.h>
 
diff --git a/gcc/testsuite/gcc.target/i386/pr36246.c b/gcc/testsuite/gcc.target/i386/pr36246.c
index 5ef573213ab..4f3e155cb35 100644
--- a/gcc/testsuite/gcc.target/i386/pr36246.c
+++ b/gcc/testsuite/gcc.target/i386/pr36246.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-O2 -mtune=generic" } */
+/* { dg-options "-O2 -fomit-frame-pointer -mtune=generic" } */
 
 typedef long long __m128i __attribute__ ((__vector_size__ (16), __may_alias__));
 typedef int __v4si __attribute__ ((__vector_size__ (16)));