diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6ad8587b1fac..98fc71868aa8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-18  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/pr31167.c: Add i?86-*-* to target selector.
+	Require lp64 effective target.
+
 2007-10-16  Mark Mitchell  <mark@codesourcery.com>
 
 	* g++.dg/opt/const5.C: New test.
diff --git a/gcc/testsuite/gcc.target/i386/pr31167.c b/gcc/testsuite/gcc.target/i386/pr31167.c
index 883ab5a159c1..8cf9e79726d7 100644
--- a/gcc/testsuite/gcc.target/i386/pr31167.c
+++ b/gcc/testsuite/gcc.target/i386/pr31167.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O" } */
 
 typedef int int32_t;