diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 160926aa8589..dcfb7ba08b17 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-24  Michael Matz  <matz@suse.de>
+
+	* gcc.dg/i386-regparm.c: New.
+
 2004-02-23  James E Wilson  <wilson@specifixinc.com>
 
 	* gcc.c-torture/execute/20040223-1.c: New.
diff --git a/gcc/testsuite/gcc.dg/i386-regparm.c b/gcc/testsuite/gcc.dg/i386-regparm.c
new file mode 100644
index 000000000000..18206ea7fc34
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/i386-regparm.c
@@ -0,0 +1,9 @@
+/* { dg-do compile { target i?86-*-* } } */
+/* { dg-options "-W -Wall" } */
+
+/* Verify that GCC correctly detects non-matching regparm attributes.  */
+int __attribute__((regparm(3))) f (void);  /* { dg-error "previous" } */
+
+int __attribute__((regparm(2))) f (void) { /* { dg-error "conflicting" } */
+  return 0;
+}