diff --git a/test/fixedbugs/bug205.go b/test/fixedbugs/bug205.go
index 4262ec1..e12be72 100644
--- a/test/fixedbugs/bug205.go
+++ b/test/fixedbugs/bug205.go
@@ -12,7 +12,7 @@
 
 func main() {
 	println(t["hi"]);	// ERROR "integer"
-	println(s["hi"]);	// ERROR "integer"
+	println(s["hi"]);	// ERROR "integer" "to type uint"
 	println(m[0]);	// ERROR "map index"
 }
 
diff --git a/test/fixedbugs/bug228.go b/test/fixedbugs/bug228.go
index 81bc908..da335db 100644
--- a/test/fixedbugs/bug228.go
+++ b/test/fixedbugs/bug228.go
@@ -8,7 +8,7 @@
 
 func f(x int, y ...int)	// ok
 
-func g(x int, y float) (...)	// ERROR "[.][.][.]"
+func g(x int, y float) (...)	// ERROR "[.][.][.]" "final argument"
 
 func h(x, y ...int)		// ERROR "[.][.][.]"
 
diff --git a/test/fixedbugs/bug229.go b/test/fixedbugs/bug229.go
index fe0f0d8..6c9de9b 100644
--- a/test/fixedbugs/bug229.go
+++ b/test/fixedbugs/bug229.go
@@ -16,5 +16,5 @@
 
 	t.ch = nil	// ERROR "unexported"
 	
-	println(testing.anyLowercaseName("asdf"))	// ERROR "unexported"
+	println(testing.anyLowercaseName("asdf"))	// ERROR "unexported" "undefined: testing.anyLowercaseName"
 }
diff --git a/test/fixedbugs/bug231.go b/test/fixedbugs/bug231.go
index 91996d3..9500e58 100644
--- a/test/fixedbugs/bug231.go
+++ b/test/fixedbugs/bug231.go
@@ -17,6 +17,6 @@
 	var i I
 	
 	i = m
-	i = t	// ERROR "not a method|has no methods"
+	i = t	// ERROR "not a method|has no methods" "does not implement I"
 	_ = i
 }
diff --git a/test/fixedbugs/bug297.go b/test/fixedbugs/bug297.go
index ba02942..8767cdf 100644
--- a/test/fixedbugs/bug297.go
+++ b/test/fixedbugs/bug297.go
@@ -11,5 +11,5 @@
 type ByteSize float64
 const (
 	_ = iota;   // ignore first value by assigning to blank identifier
-	KB ByteSize = 1<<(10*X) // ERROR "undefined"
+	KB ByteSize = 1<<(10*X) // ERROR "undefined" "as type ByteSize"
 )
diff --git a/test/fixedbugs/bug351.go b/test/fixedbugs/bug351.go
index c33e282..2f631bb 100644
--- a/test/fixedbugs/bug351.go
+++ b/test/fixedbugs/bug351.go
@@ -6,6 +6,8 @@
 
 package main
 
+var x int
+
 func main() {
 	(x) := 0  // ERROR "non-name [(]x[)]"
 }
diff --git a/test/fixedbugs/bug359.go b/test/fixedbugs/bug359.go
index 6ced608..7f34672 100644
--- a/test/fixedbugs/bug359.go
+++ b/test/fixedbugs/bug359.go
@@ -16,7 +16,7 @@
 }
 
 func (p Painting) Foo() {
-	for e := p.fragments; e.Front() != nil; e = e.Next() {  // ERROR "unexported field"
+	for e := p.fragments; e.Front() != nil; {  // ERROR "unexported field"
 	}
 }