diff --git a/test/complit1.go b/test/complit1.go
index aaf701f73f7..cd543930eef 100644
--- a/test/complit1.go
+++ b/test/complit1.go
@@ -34,6 +34,6 @@ type T struct {
 
 var (
 	_ = &T{0, 0, "", nil}               // ok
-	_ = &T{i: 0, f: 0, s: "", next: {}} // ERROR "missing type in composite literal"
-	_ = &T{0, 0, "", {}}                // ERROR "missing type in composite literal"
+	_ = &T{i: 0, f: 0, s: "", next: {}} // ERROR "missing type in composite literal|omit types within composite literal"
+	_ = &T{0, 0, "", {}}                // ERROR "missing type in composite literal|omit types within composite literal"
 )
diff --git a/test/convert1.go b/test/convert1.go
index 9de1b7e0170..bbd0c5f2b06 100644
--- a/test/convert1.go
+++ b/test/convert1.go
@@ -25,72 +25,72 @@ func main() {
 	_ = string(s)
 	_ = []byte(s)
 	_ = []rune(s)
-	_ = []int64(s) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(s) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(s)
 	_ = Tbyte(s)
 	_ = Trune(s)
-	_ = Tint64(s) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(s) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
 	_ = string(sb)
 	_ = []byte(sb)
-	_ = []rune(sb)  // ERROR "cannot convert.*\[\]rune"
-	_ = []int64(sb) // ERROR "cannot convert.*\[\]int64"
+	_ = []rune(sb)  // ERROR "cannot convert.*\[\]rune|invalid type conversion"
+	_ = []int64(sb) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(sb)
 	_ = Tbyte(sb)
-	_ = Trune(sb)  // ERROR "cannot convert.*Trune"
-	_ = Tint64(sb) // ERROR "cannot convert.*Tint64"
+	_ = Trune(sb)  // ERROR "cannot convert.*Trune|invalid type conversion"
+	_ = Tint64(sb) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
 	_ = string(sr)
-	_ = []byte(sr) // ERROR "cannot convert.*\[\]byte"
+	_ = []byte(sr) // ERROR "cannot convert.*\[\]byte|invalid type conversion"
 	_ = []rune(sr)
-	_ = []int64(sr) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(sr) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(sr)
-	_ = Tbyte(sr) // ERROR "cannot convert.*Tbyte"
+	_ = Tbyte(sr) // ERROR "cannot convert.*Tbyte|invalid type conversion"
 	_ = Trune(sr)
-	_ = Tint64(sr) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(sr) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
-	_ = string(si) // ERROR "cannot convert.* string"
-	_ = []byte(si) // ERROR "cannot convert.*\[\]byte"
-	_ = []rune(si) // ERROR "cannot convert.*\[\]rune"
+	_ = string(si) // ERROR "cannot convert.* string|invalid type conversion"
+	_ = []byte(si) // ERROR "cannot convert.*\[\]byte|invalid type conversion"
+	_ = []rune(si) // ERROR "cannot convert.*\[\]rune|invalid type conversion"
 	_ = []int64(si)
-	_ = Tstring(si) // ERROR "cannot convert.*Tstring"
-	_ = Tbyte(si)   // ERROR "cannot convert.*Tbyte"
-	_ = Trune(si)   // ERROR "cannot convert.*Trune"
+	_ = Tstring(si) // ERROR "cannot convert.*Tstring|invalid type conversion"
+	_ = Tbyte(si)   // ERROR "cannot convert.*Tbyte|invalid type conversion"
+	_ = Trune(si)   // ERROR "cannot convert.*Trune|invalid type conversion"
 	_ = Tint64(si)
 
 	_ = string(ts)
 	_ = []byte(ts)
 	_ = []rune(ts)
-	_ = []int64(ts) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(ts) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(ts)
 	_ = Tbyte(ts)
 	_ = Trune(ts)
-	_ = Tint64(ts) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(ts) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
 	_ = string(tsb)
 	_ = []byte(tsb)
-	_ = []rune(tsb)  // ERROR "cannot convert.*\[\]rune"
-	_ = []int64(tsb) // ERROR "cannot convert.*\[\]int64"
+	_ = []rune(tsb)  // ERROR "cannot convert.*\[\]rune|invalid type conversion"
+	_ = []int64(tsb) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(tsb)
 	_ = Tbyte(tsb)
-	_ = Trune(tsb)  // ERROR "cannot convert.*Trune"
-	_ = Tint64(tsb) // ERROR "cannot convert.*Tint64"
+	_ = Trune(tsb)  // ERROR "cannot convert.*Trune|invalid type conversion"
+	_ = Tint64(tsb) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
 	_ = string(tsr)
-	_ = []byte(tsr) // ERROR "cannot convert.*\[\]byte"
+	_ = []byte(tsr) // ERROR "cannot convert.*\[\]byte|invalid type conversion"
 	_ = []rune(tsr)
-	_ = []int64(tsr) // ERROR "cannot convert.*\[\]int64"
+	_ = []int64(tsr) // ERROR "cannot convert.*\[\]int64|invalid type conversion"
 	_ = Tstring(tsr)
-	_ = Tbyte(tsr) // ERROR "cannot convert.*Tbyte"
+	_ = Tbyte(tsr) // ERROR "cannot convert.*Tbyte|invalid type conversion"
 	_ = Trune(tsr)
-	_ = Tint64(tsr) // ERROR "cannot convert.*Tint64"
+	_ = Tint64(tsr) // ERROR "cannot convert.*Tint64|invalid type conversion"
 
-	_ = string(tsi) // ERROR "cannot convert.* string"
-	_ = []byte(tsi) // ERROR "cannot convert.*\[\]byte"
-	_ = []rune(tsi) // ERROR "cannot convert.*\[\]rune"
+	_ = string(tsi) // ERROR "cannot convert.* string|invalid type conversion"
+	_ = []byte(tsi) // ERROR "cannot convert.*\[\]byte|invalid type conversion"
+	_ = []rune(tsi) // ERROR "cannot convert.*\[\]rune|invalid type conversion"
 	_ = []int64(tsi)
-	_ = Tstring(tsi) // ERROR "cannot convert.*Tstring"
-	_ = Tbyte(tsi)   // ERROR "cannot convert.*Tbyte"
-	_ = Trune(tsi)   // ERROR "cannot convert.*Trune"
+	_ = Tstring(tsi) // ERROR "cannot convert.*Tstring|invalid type conversion"
+	_ = Tbyte(tsi)   // ERROR "cannot convert.*Tbyte|invalid type conversion"
+	_ = Trune(tsi)   // ERROR "cannot convert.*Trune|invalid type conversion"
 	_ = Tint64(tsi)
 }
diff --git a/test/fixedbugs/bug195.go b/test/fixedbugs/bug195.go
index 65ab02a0393..d8e112a3a68 100644
--- a/test/fixedbugs/bug195.go
+++ b/test/fixedbugs/bug195.go
@@ -23,5 +23,5 @@ type I5 interface {
 }
 
 type I6 interface {
-	I5	// GC_ERROR "interface"
+	I5	// ERROR "interface"
 }
diff --git a/test/fixedbugs/bug251.go b/test/fixedbugs/bug251.go
index 385f28dd4da..d2ee6fb29db 100644
--- a/test/fixedbugs/bug251.go
+++ b/test/fixedbugs/bug251.go
@@ -12,7 +12,7 @@ type I1 interface {
 }
 
 type I2 interface {
-	I1 // GC_ERROR "loop|interface"
+	I1 // ERROR "loop|interface"
 }
 
 
diff --git a/test/fixedbugs/bug374.go b/test/fixedbugs/bug374.go
index 2e6f27adcdf..b55c5df4567 100644
--- a/test/fixedbugs/bug374.go
+++ b/test/fixedbugs/bug374.go
@@ -13,8 +13,8 @@ type I interface {
 
 type T int
 
-var _ I = T(0)
+var _ I = T(0)	// GCCGO_ERROR "incompatible"
 
 func (T) m(buf []byte) (a int, b xxxx) {  // ERROR "xxxx"
 	return 0, nil
-}
\ No newline at end of file
+}
diff --git a/test/fixedbugs/bug383.go b/test/fixedbugs/bug383.go
index 9dccff590e5..181a897b63d 100644
--- a/test/fixedbugs/bug383.go
+++ b/test/fixedbugs/bug383.go
@@ -8,6 +8,6 @@
 
 package main
 func main() {
-	if 2e9 { }      // ERROR "2e.09"
-	if 3.14+1i { }  // ERROR "3.14 . 1i"
-}
\ No newline at end of file
+	if 2e9 { }      // ERROR "2e.09|expected bool"
+	if 3.14+1i { }  // ERROR "3.14 . 1i|expected bool"
+}
diff --git a/test/fixedbugs/bug386.go b/test/fixedbugs/bug386.go
index 85b8d308245..b42c07073b0 100644
--- a/test/fixedbugs/bug386.go
+++ b/test/fixedbugs/bug386.go
@@ -7,6 +7,6 @@
 // Issue 2451, 2452 
 package foo
 
-func f() error { return 0 } // ERROR "cannot use 0 .type int."
+func f() error { return 0 } // ERROR "cannot use 0 .type int.|has no methods"
 
-func g() error { return -1 }  // ERROR "cannot use -1 .type int."
\ No newline at end of file
+func g() error { return -1 }  // ERROR "cannot use -1 .type int.|has no methods"
diff --git a/test/fixedbugs/bug388.go b/test/fixedbugs/bug388.go
index d480e852f09..1459285b2fa 100644
--- a/test/fixedbugs/bug388.go
+++ b/test/fixedbugs/bug388.go
@@ -9,27 +9,27 @@
 package main
 import "runtime"
 
-func foo(runtime.UintType, i int) {  // ERROR "cannot declare name runtime.UintType"
+func foo(runtime.UintType, i int) {  // ERROR "cannot declare name runtime.UintType|named/anonymous mix"
 	println(i, runtime.UintType) 
 }
 
 func bar(i int) {
-	runtime.UintType := i       // ERROR "cannot declare name runtime.UintType"
-	println(runtime.UintType)
+	runtime.UintType := i       // ERROR "cannot declare name runtime.UintType|non-name on left side"
+	println(runtime.UintType)	// GCCGO_ERROR "invalid use of type"
 }
 
 func baz() {
-	main.i := 1	// ERROR "non-name main.i"
-	println(main.i)
+	main.i := 1	// ERROR "non-name main.i|non-name on left side"
+	println(main.i)	// GCCGO_ERROR "no fields or methods"
 }
 
 func qux() {
-	var main.i	// ERROR "unexpected [.]"
+	var main.i	// ERROR "unexpected [.]|expected type"
 	println(main.i)
 }
 
 func corge() {
-	var foo.i int  // ERROR "unexpected [.]"
+	var foo.i int  // ERROR "unexpected [.]|expected type"
 	println(foo.i)
 }
 
diff --git a/test/fixedbugs/bug389.go b/test/fixedbugs/bug389.go
index 40d6c419cfe..ecbbbdd585e 100644
--- a/test/fixedbugs/bug389.go
+++ b/test/fixedbugs/bug389.go
@@ -9,4 +9,4 @@ package foo
 
 func fn(a float32) {}
 
-var f func(arg int) = fn  // ERROR "cannot use fn .type func.float32.. as type func.int. in assignment"
\ No newline at end of file
+var f func(arg int) = fn  // ERROR "cannot use fn .type func.float32.. as type func.int. in assignment|different parameter types"
diff --git a/test/fixedbugs/bug390.go b/test/fixedbugs/bug390.go
index 9ee5bc9d6cd..31c4dd40bab 100644
--- a/test/fixedbugs/bug390.go
+++ b/test/fixedbugs/bug390.go
@@ -12,5 +12,5 @@ import "unsafe"
 
 func main() {
 	var x *int
-	_ = unsafe.Pointer(x) - unsafe.Pointer(x) // ERROR "operator - not defined on unsafe.Pointer"
+	_ = unsafe.Pointer(x) - unsafe.Pointer(x) // ERROR "operator - not defined on unsafe.Pointer|expected integer, floating, or complex type"
 }
diff --git a/test/fixedbugs/bug394.go b/test/fixedbugs/bug394.go
index 4d0f090bcd7..42c20e7a918 100644
--- a/test/fixedbugs/bug394.go
+++ b/test/fixedbugs/bug394.go
@@ -7,4 +7,4 @@
 // Issue 2598
 package foo
 
-return nil // ERROR "non-declaration statement outside function body"
+return nil // ERROR "non-declaration statement outside function body|expected declaration"
diff --git a/test/fixedbugs/bug397.go b/test/fixedbugs/bug397.go
index cc8bfc017e3..03957013023 100644
--- a/test/fixedbugs/bug397.go
+++ b/test/fixedbugs/bug397.go
@@ -9,5 +9,5 @@ package main
 // Issue 2623
 var m = map[string]int {
 	"abc":1,
-	1:2, // ERROR "cannot use 1.*as type string in map key"
+	1:2, // ERROR "cannot use 1.*as type string in map key|incompatible type"
 }
diff --git a/test/switch3.go b/test/switch3.go
index e91499db096..6c9ebfe6d48 100644
--- a/test/switch3.go
+++ b/test/switch3.go
@@ -15,31 +15,31 @@ func bad() {
 	var s string
 
 	switch i {
-	case s: // ERROR "mismatched types string and I"
+	case s: // ERROR "mismatched types string and I|incompatible types"
 	}
 
 	switch s {
-	case i: // ERROR "mismatched types I and string"
+	case i: // ERROR "mismatched types I and string|incompatible types"
 	}
 
 	var m, m1 map[int]int
 	switch m {
 	case nil:
-	case m1: // ERROR "can only compare map m to nil"
+	case m1: // ERROR "can only compare map m to nil|map can only be compared to nil"
 	default:
 	}
 
 	var a, a1 []int
 	switch a {
 	case nil:
-	case a1: // ERROR "can only compare slice a to nil"
+	case a1: // ERROR "can only compare slice a to nil|slice can only be compared to nil"
 	default:
 	}
 
 	var f, f1 func()
 	switch f {
 	case nil:
-	case f1: // ERROR "can only compare func f to nil"
+	case f1: // ERROR "can only compare func f to nil|func can only be compared to nil"
 	default:
 	}
 }
diff --git a/test/syntax/else.go b/test/syntax/else.go
index 186d5959a8c..99595254fd4 100644
--- a/test/syntax/else.go
+++ b/test/syntax/else.go
@@ -8,5 +8,5 @@ package main
 
 func main() {
 	if true {
-	} else ;  // ERROR "else must be followed by if or statement block"
+	} else ;  // ERROR "else must be followed by if or statement block|expected .if. or .{."
 }
diff --git a/test/typeswitch2.go b/test/typeswitch2.go
index 57c5a18ab2d..3e3acdae377 100644
--- a/test/typeswitch2.go
+++ b/test/typeswitch2.go
@@ -23,10 +23,10 @@ func whatis(x interface{}) string {
 		w()
 	}:
 		return "rw"
-	case interface {
+	case interface {	// GCCGO_ERROR "duplicate"
 		w()
 		r()
-	}: // ERROR "duplicate"
+	}: // GC_ERROR "duplicate"
 		return "wr"
 
 	}