test/bugs/bug305.go => test/fixedbugs/bug305.go | 2 +-
 test/errchk                                     | 4 ++--
 test/golden.out                                 | 8 --------

diff --git a/test/bugs/bug305.go b/test/fixedbugs/bug305.go
rename from test/bugs/bug305.go
rename to test/fixedbugs/bug305.go
index 1369d560e8fafcfea81ab90b53ef110da02456de..758fee2698acdb8934868f0a0e901775d1c2c60e 100644
--- a/test/bugs/bug305.go
+++ b/test/fixedbugs/bug305.go
@@ -5,7 +5,7 @@ // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Use //line to set the line number of the next line to 20.
-//line bug305.go:20
+//line fixedbugs/bug305.go:20
 
 package p
 
diff --git a/test/errchk b/test/errchk
index ab7192da2a823f86959ad5b900bb69ee72ed64d9..d65899be6197349836e132788f5b6cfb3df0aa42 100755
--- a/test/errchk
+++ b/test/errchk
@@ -68,8 +68,8 @@ 		next;
 	}
 	$regexp = $1;
 
-	@errmsg = grep { /$file:$line:/ } @out;
-	@out = grep { !/$file:$line:/ } @out;
+	@errmsg = grep { /$file:$line[:[]/ } @out;
+	@out = grep { !/$file:$line[:[]/ } @out;
 	if(@errmsg == 0) {
 		bug();
 		print STDERR "errchk: $file:$line: missing expected error: '$regexp'\n";
diff --git a/test/golden.out b/test/golden.out
index eb1f2320a12e57826a94292df7a6662ee8bd1f25..49bca4b874b17eba73c447c88bc23ba74813597b 100644
--- a/test/golden.out
+++ b/test/golden.out
@@ -177,11 +177,3 @@
 =========== bugs/bug260.go
 FAIL
 BUG: bug260 failed
-
-=========== bugs/bug305.go
-BUG: errchk: bugs/bug305.go:24: missing expected error: 'cannot|incompatible'
-errchk: bugs/bug305.go: unmatched error messages:
-==================================================
-bug305.go:23[bugs/bug305.go:12]: cannot convert "bogus" to type int
-bug305.go:23[bugs/bug305.go:12]: cannot use "bogus" (type string) as type int in assignment
-==================================================