diff --git a/test/bugs/bug099.go b/test/fixedbugs/bug099.go
similarity index 97%
rename from test/bugs/bug099.go
rename to test/fixedbugs/bug099.go
index eddfcb80880..f76f0e873cf 100644
--- a/test/bugs/bug099.go
+++ b/test/fixedbugs/bug099.go
@@ -29,7 +29,6 @@ func Use(x I) {
 func main() {
 	i := NewI(0);
 	Use(i);
-	print("done1\n");
 
 	// Again, without temporary
 	// Crashes because x.F is 0.
diff --git a/test/bugs/bug102.go b/test/fixedbugs/bug102.go
similarity index 100%
rename from test/bugs/bug102.go
rename to test/fixedbugs/bug102.go
diff --git a/test/bugs/bug107.go b/test/fixedbugs/bug107.go
similarity index 100%
rename from test/bugs/bug107.go
rename to test/fixedbugs/bug107.go
diff --git a/test/bugs/bug111.go b/test/fixedbugs/bug111.go
similarity index 100%
rename from test/bugs/bug111.go
rename to test/fixedbugs/bug111.go
diff --git a/test/bugs/bug112.go b/test/fixedbugs/bug112.go
similarity index 100%
rename from test/bugs/bug112.go
rename to test/fixedbugs/bug112.go
diff --git a/test/golden.out b/test/golden.out
index 5fcde598244..08479d408b6 100644
--- a/test/golden.out
+++ b/test/golden.out
@@ -3,8 +3,7 @@
 hello, world
 
 =========== ./interface1.go
-./interface1.go:5: syntax error near package
-./interface1.go:31: illegal types for operand: AS
+./interface1.go:29: illegal types for operand: AS
 	interface { Next () (*Inst) }
 	*Inst
 
@@ -115,12 +114,12 @@ M
 =========== bugs/bug095.go
 found 2, expected 1
 
-panic on line 80 PC=xxx
+panic on line 81 PC=xxx
 BUG wrong result
 
 =========== bugs/bug097.go
 
-panic on line 82 PC=xxx
+panic on line 83 PC=xxx
 BUG wrong result
 
 =========== bugs/bug098.go
@@ -129,9 +128,6 @@ bugs/bug098.go:10: illegal types for operand: AS
 	**M
 BUG should compile
 
-=========== bugs/bug099.go
-done1
-
 =========== bugs/bug105.go
 bugs/bug105.go:8: P: undefined
 bugs/bug105.go:9: illegal types for operand: RETURN
@@ -185,7 +181,7 @@ fixedbugs/bug035.go:7: var f redeclared in this block
 
 =========== fixedbugs/bug037.go
 fixedbugs/bug037.go:6: vlong: undefined
-fixedbugs/bug037.go:6: fatal error: addvar: n=NAME-s G0 a(1) l(76) t=<T> nil
+fixedbugs/bug037.go:6: fatal error: addvar: n=NAME-s G0 a(1) l(77) t=<T> nil
 
 =========== fixedbugs/bug039.go
 fixedbugs/bug039.go:6: var x redeclared in this block
@@ -241,7 +237,7 @@ fixedbugs/bug086.go:5: function ends without a return statement
 
 =========== fixedbugs/bug091.go
 fixedbugs/bug091.go:15: c: undefined
-fixedbugs/bug091.go:15: fatal error: addvar: n=NAME-i G0 a(1) l(85) t=<T> nil
+fixedbugs/bug091.go:15: fatal error: addvar: n=NAME-i G0 a(1) l(86) t=<T> nil
 
 =========== fixedbugs/bug103.go
 fixedbugs/bug103.go:8: function requires a return type