diff --git a/test/assign.go b/test/assign.go
index a98b7b75a0..9fe9ea0791 100644
--- a/test/assign.go
+++ b/test/assign.go
@@ -16,18 +16,18 @@ type T struct {
 func main() {
 	{
 		var x, y sync.Mutex;
-		x = y;	// ERROR "assignment.*Mutex"
+		x = y;	// ERROR "assignment\[ -~\]*Mutex"
 	}
 	{
 		var x, y T;
-		x = y;	// ERROR "assignment.*Mutex"
+		x = y;	// ERROR "assignment\[ -~\]*Mutex"
 	}
 	{
 		var x, y [2]sync.Mutex;
-		x = y;	// ERROR "assignment.*Mutex"
+		x = y;	// ERROR "assignment\[ -~\]*Mutex"
 	}
 	{
 		var x, y [2]T;
-		x = y;	// ERROR "assignment.*Mutex"
+		x = y;	// ERROR "assignment\[ -~\]*Mutex"
 	}
 }
diff --git a/test/chan/perm.go b/test/chan/perm.go
index 31ab840085..cdbef6246c 100644
--- a/test/chan/perm.go
+++ b/test/chan/perm.go
@@ -15,10 +15,10 @@ var (
 func main() {
 	cr = c;		// ok
 	cs = c;		// ok
-	c = cr;		// ERROR "illegal types"
-	c = cs;		// ERROR "illegal types"
-	cr = cs;	// ERROR "illegal types"
-	cs = cr;	// ERROR "illegal types"
+	c = cr;		// ERROR "illegal types|incompatible"
+	c = cs;		// ERROR "illegal types|incompatible"
+	cr = cs;	// ERROR "illegal types|incompatible"
+	cs = cr;	// ERROR "illegal types|incompatible"
 
 	c <- 0;		// ok
 	ok := c <- 0;	// ok
diff --git a/test/golden.out b/test/golden.out
index b5dbddffe6..131fc895b9 100644
--- a/test/golden.out
+++ b/test/golden.out
@@ -27,7 +27,7 @@ panic PC=xxx
 hello, world
 
 =========== ./initializerr.go
-BUG: errchk: ./initializerr.go:17: missing expected error: 'index'
+BUG: errchk: ./initializerr.go:17: missing expected error: 'index|too many'
 
 =========== ./peano.go
 0! = 1
diff --git a/test/initializerr.go b/test/initializerr.go
index 2700ba097b..b0366dddec 100644
--- a/test/initializerr.go
+++ b/test/initializerr.go
@@ -15,10 +15,10 @@ type T struct {
 }
 
 var x = 1
-var a1 = S { 0, X: 1 };	// ERROR "mixture"
+var a1 = S { 0, X: 1 };	// ERROR "mixture|undefined"
 var a2 = S { Y: 3, Z: 2, Y: 3 }; // ERROR "duplicate"
-var a3 = T { 1, 2, 3, 4, 5, 6 };	// ERROR "convert"
-var a4 = [5]byte{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }	// ERROR "index"
+var a3 = T { 1, 2, 3, 4, 5, 6 };	// ERROR "convert|too many"
+var a4 = [5]byte{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }	// ERROR "index|too many"
 var a5 = []byte { x: 2 }	// ERROR "index"
 
 var ok1 = S { }	// should be ok