diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 34f8c0826c4..35adc95c321 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-16  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/28639
+	PR c++/30299
+	* g++.dg/template/void12.C: New.
+	* g++.dg/template/void13.C: New.
+
 2007-10-16  Paolo Carlini  <pcarlini@suse.de>
 
 	PR c++/31446
diff --git a/gcc/testsuite/g++.dg/template/void12.C b/gcc/testsuite/g++.dg/template/void12.C
new file mode 100644
index 00000000000..1d064b63e0c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/void12.C
@@ -0,0 +1,7 @@
+// PR c++/28639
+
+template<void> struct A  // { dg-error "not a valid type" }
+{
+  static const int i = 1;
+  char a[i];
+};
diff --git a/gcc/testsuite/g++.dg/template/void13.C b/gcc/testsuite/g++.dg/template/void13.C
new file mode 100644
index 00000000000..3f36735dbc1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/void13.C
@@ -0,0 +1,11 @@
+// PR c++/30299
+
+struct A
+{
+  int i;
+};
+
+template<void> struct B : A  // { dg-error "not a valid type" }
+{
+  B() { this->i; }
+};