diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4e8fee826a57..515bd263deaf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-02  Richard Sandiford  <richard@codesourcery.com>
+
+	PR c/22061
+	* gcc.c-torture/execute/pr22061-1.c,
+	* gcc.c-torture/execute/pr22061-2.c,
+	* gcc.c-torture/execute/pr22061-3.c,
+	* gcc.c-torture/execute/pr22061-4.c: New tests.
+
 2005-09-01  Craig Rodrigues  <rodrigc@gcc.gnu.org>
 
 	* gcc.dg/Wredundant-decls-2.c: New test to check that
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr22061-1.c b/gcc/testsuite/gcc.c-torture/execute/pr22061-1.c
new file mode 100644
index 000000000000..65375fecbc68
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr22061-1.c
@@ -0,0 +1,16 @@
+int N = 1;
+void foo() {} /* Necessary to trigger the original ICE.  */
+void bar (char a[2][N]) { a[1][0] = N; }
+int
+main (void)
+{
+  void *x;
+
+  N = 4;
+  x = alloca (2 * N);
+  memset (x, 0, 2 * N);
+  bar (x);
+  if (N[(char *) x] != N)
+    abort ();
+  exit (0);
+}
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr22061-2.c b/gcc/testsuite/gcc.c-torture/execute/pr22061-2.c
new file mode 100644
index 000000000000..4e1be8f0e1da
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr22061-2.c
@@ -0,0 +1,7 @@
+int *x;
+static void bar (char a[2][(*x)++]) {}
+int
+main (void)
+{
+  exit (0);
+}
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr22061-3.c b/gcc/testsuite/gcc.c-torture/execute/pr22061-3.c
new file mode 100644
index 000000000000..a805948182f3
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr22061-3.c
@@ -0,0 +1,18 @@
+void
+bar (int N)
+{
+  int foo (char a[2][++N]) { N += 4; return sizeof (a[0]); }
+  if (foo (0) != 2)
+    abort ();
+  if (foo (0) != 7)
+    abort ();
+  if (N != 11)
+    abort ();
+}
+
+int
+main()
+{
+  bar (1);
+  exit (0);
+}
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr22061-4.c b/gcc/testsuite/gcc.c-torture/execute/pr22061-4.c
new file mode 100644
index 000000000000..38ce3e8c5078
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr22061-4.c
@@ -0,0 +1,22 @@
+void
+bar (int N)
+{
+  void foo (int a[2][N++]) {}
+  int a[2][N];
+  foo (a);
+  int b[2][N];
+  foo (b);
+  if (sizeof (a) != sizeof (int) * 2 * 1)
+    abort ();
+  if (sizeof (b) != sizeof (int) * 2 * 2)
+    abort ();
+  if (N != 3)
+    abort ();
+}
+
+int
+main (void)
+{
+  bar (1);
+  exit (0);
+}