diff --git a/test/declbad.go b/test/declbad.go
index f355113a62..04f5ac04b8 100644
--- a/test/declbad.go
+++ b/test/declbad.go
@@ -16,36 +16,36 @@ func main() {
 	{
 		// simple redeclaration
 		i := f1();
-		i := f1();	// ERROR "redeclared|redefinition|no new"
+		i := f1();	// ERROR "redeclared|no new"
 	}
 	{
 		// change of type for f
-		i, f, s := f3();	// GCCGO_ERROR "previous"
-		f, g, t := f3();	// ERROR "redeclared|redefinition|cannot assign"
+		i, f, s := f3();
+		f, g, t := f3();	// ERROR "redeclared|cannot assign|incompatible"
 	}
 	{
 		// change of type for i
-		i, f, s := f3();	// GCCGO_ERROR "previous"
-		j, i, t := f3();	// ERROR "redeclared|redefinition|cannot assign"
+		i, f, s := f3();
+		j, i, t := f3();	// ERROR "redeclared|cannot assign|incompatible"
 	}
 	{
 		// no new variables
 		i, f, s := f3();
-		i, f := f2();	// ERROR "redeclared|redefinition|no new"
+		i, f := f2();	// ERROR "redeclared|no new"
 	}
 	{
 		// single redeclaration
-		i, f, s := f3();	// GCCGO_ERROR "previous"
-		i := f1();		// ERROR "redeclared|redefinition|no new"
+		i, f, s := f3();
+		i := f1();		// ERROR "redeclared|no new|incompatible"
 	}
 		// double redeclaration
 	{
 		i, f, s := f3();
-		i, f := f2();	// ERROR "redeclared|redefinition|no new"
+		i, f := f2();	// ERROR "redeclared|no new"
 	}
 	{
 		// triple redeclaration
 		i, f, s := f3();
-		i, f, s := f3();	// ERROR "redeclared|redefinition|no new"
+		i, f, s := f3();	// ERROR "redeclared|no new"
 	}
 }