diff --git a/test/bugs/bug006.go b/test/bugs/bug006.go
index e686c838538..eb5f5218a83 100644
--- a/test/bugs/bug006.go
+++ b/test/bugs/bug006.go
@@ -16,17 +16,3 @@ func main() int {
 	if g != 4.5 { print " fail\n"; return 1; }
 	return 0;
 }
-/*
-should 4.5 * iota be ok? perhaps, perhaps not. but (all!) error msgs are bad:
-bug6.go:4: illegal combination of literals 0 0
-bug6.go:4: expression must be a constant
-bug6.go:4: expression must be a constant
-bug6.go:4: expression must be a constant
-bug6.go:4: expression must be a constant
-bug6.go:4: expression must be a constant
-bug6.go:4: expression must be a constant
-bug6.go:4: expression must be a constant
-bug6.go:4: expression must be a constant
-bug6.go:4: expression must be a constant
-bug6.go:4: fatal error: too many errors
-*/
diff --git a/test/bugs/bug001.go b/test/fixedbugs/bug001.go
similarity index 100%
rename from test/bugs/bug001.go
rename to test/fixedbugs/bug001.go
diff --git a/test/bugs/bug002.go b/test/fixedbugs/bug002.go
similarity index 100%
rename from test/bugs/bug002.go
rename to test/fixedbugs/bug002.go
diff --git a/test/bugs/bug003.go b/test/fixedbugs/bug003.go
similarity index 68%
rename from test/bugs/bug003.go
rename to test/fixedbugs/bug003.go
index 07f04d227db..e45975be41a 100644
--- a/test/bugs/bug003.go
+++ b/test/fixedbugs/bug003.go
@@ -7,9 +7,8 @@
 package main
 
 func main() {
-	switch ; {}  // compiles; should be an error (should be simplevardecl before ;)
+	switch ; { case true: return; default: return }
 }
 /*
-bug003.go:6: switch statement must have case labels
 bug003.go:6: fatal error: walkswitch: not case EMPTY
 */
diff --git a/test/bugs/bug004.go b/test/fixedbugs/bug004.go
similarity index 100%
rename from test/bugs/bug004.go
rename to test/fixedbugs/bug004.go
diff --git a/test/golden.out b/test/golden.out
index 2a727a6749b..8845e16eaf4 100644
--- a/test/golden.out
+++ b/test/golden.out
@@ -114,19 +114,6 @@ abcxyz-abcxyz-abcxyz-abcxyz-abcxyz-abcxyz-abcxyz
 
 =========== ken/strvar.go
 
-=========== bugs/bug001.go
-BUG: known to succeed incorrectly
-
-=========== bugs/bug002.go
-BUG: known to succeed incorrectly
-
-=========== bugs/bug003.go
-bugs/bug003.go:6: switch statement must have case labels
-BUG: fatal error
-
-=========== bugs/bug004.go
-BUG: known to succeed incorrectly
-
 =========== bugs/bug006.go
 zero
  fail
@@ -240,6 +227,14 @@ BUG: known to fail incorrectly
 
 =========== fixedbugs/bug000.go
 
+=========== fixedbugs/bug001.go
+
+=========== fixedbugs/bug002.go
+
+=========== fixedbugs/bug003.go
+
+=========== fixedbugs/bug004.go
+
 =========== fixedbugs/bug005.go
 
 =========== fixedbugs/bug007.go