diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fb695f0624e..e56ec786382 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-16  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/fastcall-sseregparm.c: Include sse-check.h.
+	(main): Change to void and rename to sse_test.
+	* gcc.target/i386/pr24306.c: Ditto.
+	* gcc.target/i386/pr32065-2.c: Ditto.
+	* gcc.target/i386/20060512-1.c: Include sse2-check.h.
+	(main): Change to void and rename to sse2_test.
+	* gcc.target/i386/20060512-3.c: Ditto.
+
 2008-02-15  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR fortran/35150
diff --git a/gcc/testsuite/gcc.target/i386/20060512-1.c b/gcc/testsuite/gcc.target/i386/20060512-1.c
index 94c70b4e961..3defe648ba7 100644
--- a/gcc/testsuite/gcc.target/i386/20060512-1.c
+++ b/gcc/testsuite/gcc.target/i386/20060512-1.c
@@ -1,7 +1,11 @@
 /* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-std=gnu99 -msse2" } */
+
+#include "sse2-check.h"
+
 #include <emmintrin.h>
+
 __m128i __attribute__ ((__noinline__))
 vector_using_function ()
 {
@@ -17,8 +21,9 @@ self_aligning_function (int x, int y)
 }
 int g_1 = 20;
 int g_2 = 22;
-int
-main ()
+
+static void
+sse2_test (void)
 {
   int result;
   asm ("pushl %esi");		/* Disalign runtime stack.  */
diff --git a/gcc/testsuite/gcc.target/i386/20060512-3.c b/gcc/testsuite/gcc.target/i386/20060512-3.c
index d0fd45bce0c..5ffa8129e38 100644
--- a/gcc/testsuite/gcc.target/i386/20060512-3.c
+++ b/gcc/testsuite/gcc.target/i386/20060512-3.c
@@ -1,7 +1,11 @@
 /* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-std=gnu99 -msse2 -mstackrealign" } */
+
+#include "sse2-check.h"
+
 #include <emmintrin.h>
+
 __m128i __attribute__ ((__noinline__))
 vector_using_function ()
 {
@@ -17,8 +21,9 @@ self_aligning_function (int x, int y)
 }
 int g_1 = 20;
 int g_2 = 22;
-int
-main ()
+
+static void
+sse2_test (void)
 {
   int result;
   asm ("pushl %esi");		/* Disalign runtime stack.  */
diff --git a/gcc/testsuite/gcc.target/i386/fastcall-sseregparm.c b/gcc/testsuite/gcc.target/i386/fastcall-sseregparm.c
index 8d6bf3fb8a4..bdfae5b3b7b 100644
--- a/gcc/testsuite/gcc.target/i386/fastcall-sseregparm.c
+++ b/gcc/testsuite/gcc.target/i386/fastcall-sseregparm.c
@@ -2,6 +2,8 @@
 /* { dg-options "-mpreferred-stack-boundary=4 -msse" } */
 /* { dg-require-effective-target ilp32 } */
 
+#include "sse-check.h"
+
 extern void abort(void);
 
 void __attribute__((fastcall, sseregparm)) foo(int i, int j, float x)
@@ -14,9 +16,9 @@ void __attribute__((fastcall, sseregparm)) foo(int i, int j, float x)
     abort ();
 }
 
-int main()
+static void
+sse_test (void)
 {
 	foo(0,0,0.0);
 	foo(0,0,0.0);
-	return 0;
 }
diff --git a/gcc/testsuite/gcc.target/i386/pr24306.c b/gcc/testsuite/gcc.target/i386/pr24306.c
index 61aca39ac0c..c578475bbea 100644
--- a/gcc/testsuite/gcc.target/i386/pr24306.c
+++ b/gcc/testsuite/gcc.target/i386/pr24306.c
@@ -1,6 +1,8 @@
 /* { dg-do run } */
 /* { dg-options "-msse" } */
 
+#include "sse-check.h"
+
 extern void abort(void);
 typedef int __attribute__ ((vector_size (16))) foo_t;
 
@@ -25,8 +27,8 @@ check (int x, ...)
     abort ();
 }
 
-int main()
+static void
+sse_test (void)
 {
   check (3, s1, 7);
-  return 0;
 }
diff --git a/gcc/testsuite/gcc.target/i386/pr32065-2.c b/gcc/testsuite/gcc.target/i386/pr32065-2.c
index 61ecfe9e3b6..e1a88592d3c 100644
--- a/gcc/testsuite/gcc.target/i386/pr32065-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr32065-2.c
@@ -2,13 +2,14 @@
 /* { dg-require-effective-target dfp } */
 /* { dg-options "-Os -msse -std=gnu99" } */
 
+#include "sse-check.h"
+
 extern void abort (void);
 
-int main()
+static void
+sse_test (void)
 {
   if (7.999999999999999999999999999999999E6144dl + 3.0E6144dl
       != __builtin_infd32 ())
     abort ();
-
-  return 0;
 }