diff --git a/test/errchk b/test/errchk
index ab7192da2a8..d65899be619 100755
--- a/test/errchk
+++ b/test/errchk
@@ -68,8 +68,8 @@ foreach $src (@src) {
 	}
 	$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/bugs/bug305.go b/test/fixedbugs/bug305.go
similarity index 93%
rename from test/bugs/bug305.go
rename to test/fixedbugs/bug305.go
index 1369d560e8f..758fee2698a 100644
--- a/test/bugs/bug305.go
+++ b/test/fixedbugs/bug305.go
@@ -5,7 +5,7 @@
 // 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/golden.out b/test/golden.out
index eb1f2320a12..49bca4b874b 100644
--- a/test/golden.out
+++ b/test/golden.out
@@ -177,11 +177,3 @@ panic PC=xxx
 =========== 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
-==================================================