diff --git a/test/fixedbugs/bug117.go b/test/fixedbugs/bug117.go
index cc3ac34ce98..8e447cd455a 100644
--- a/test/fixedbugs/bug117.go
+++ b/test/fixedbugs/bug117.go
@@ -15,7 +15,7 @@ func fn(p PS) int {
   // p has type PS, and PS has no methods.
   // (a compiler might see that p is a pointer
   // and go looking in S without noticing PS.)
-  return p.get()	// ERROR "undefined DOT"
+  return p.get()	// ERROR "undefined"
 }
 func main() {
   s := S{1};
diff --git a/test/import1.go b/test/import1.go
index caa12224c83..35b618937f4 100644
--- a/test/import1.go
+++ b/test/import1.go
@@ -9,6 +9,6 @@
 package main
 
 import (
-	"bufio";
-	bufio "os";	// ERROR "redeclaration"
+	"bufio";	// GCCGO_ERROR "previous"
+	bufio "os";	// ERROR "redeclaration|redefinition|incompatible"
 )
diff --git a/test/interface9.go b/test/interface9.go
index 42214bd7693..c26bdb0872a 100644
--- a/test/interface9.go
+++ b/test/interface9.go
@@ -26,12 +26,12 @@ func main() {
 	var sp SP;
 
 	v = t;
-	p = t;	// ERROR "is not"
+	p = t;	// ERROR "is not|requires a pointer"
 	v = &t;
 	p = &t;
 
 	v = s;
-	p = s;	// ERROR "is not"
+	p = s;	// ERROR "is not|requires a pointer"
 	v = &s;
 	p = &s;