diff --git a/test/fixedbugs/bug206.go b/test/fixedbugs/bug206.go
index 7efc0b14afb7969b6b3e9936f580cab78bd5c11c..c2382acf13ff5119c7f03f55413785545c4043b7 100644
--- a/test/fixedbugs/bug206.go
+++ b/test/fixedbugs/bug206.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A && ./$A.out >/dev/null 2>&1 || echo BUG: bug206
+// cmpout
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug206.out b/test/fixedbugs/bug206.out
new file mode 100644
index 0000000000000000000000000000000000000000..aa47d0d46d47a06090f436b0b851b76bb6f3b6e2
--- /dev/null
+++ b/test/fixedbugs/bug206.out
@@ -0,0 +1,2 @@
+0
+0
diff --git a/test/fixedbugs/bug222.go b/test/fixedbugs/bug222.go
index 5c23a533d19c76a29524b401dfe7d670fede5dc7..3b99da84d4ba1d6a0ae65397970314f5d08475f9 100644
--- a/test/fixedbugs/bug222.go
+++ b/test/fixedbugs/bug222.go
@@ -1,4 +1,4 @@
-// $G $D/$F.dir/chanbug.go && $G -I. $D/$F.dir/chanbug2.go
+// compiledir
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug335.dir/a.go b/test/fixedbugs/bug335.dir/a.go
index 5a8112a9de33faf7a885a92856ed47024f6cbee2..256c110d703736c6763e855b108e5dd8a931a6d9 100644
--- a/test/fixedbugs/bug335.dir/a.go
+++ b/test/fixedbugs/bug335.dir/a.go
@@ -4,6 +4,8 @@
 
 package a
 
-import "./b"
+type T interface{}
 
-var Bar = b.Foo
+func f() T { return nil }
+
+var Foo T = f()
diff --git a/test/fixedbugs/bug335.dir/b.go b/test/fixedbugs/bug335.dir/b.go
index 7428c2a918a4ccb62d5ad4379d3a10b2ca315cbb..1474470d4ceba10846b69bbf0f173542676901cf 100644
--- a/test/fixedbugs/bug335.dir/b.go
+++ b/test/fixedbugs/bug335.dir/b.go
@@ -4,8 +4,6 @@
 
 package b
 
-type T interface{}
+import "./a"
 
-func f() T { return nil }
-
-var Foo T = f()
+var Bar = a.Foo
diff --git a/test/fixedbugs/bug335.go b/test/fixedbugs/bug335.go
index 915b746578ccbe3ba7d895a49c16f6c6baab4cd5..37c97d7b5e210592865cc3558e1b01c7942ad457 100644
--- a/test/fixedbugs/bug335.go
+++ b/test/fixedbugs/bug335.go
@@ -1,5 +1,4 @@
-// $G $D/$F.dir/b.go && $G $D/$F.dir/a.go
-// rm -f a.$A b.$A
+// compiledir
 
 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
@@ -7,4 +6,4 @@
 
 // Issue 1705.
 
-unused (see script at top of file)
+package ignored
diff --git a/test/fixedbugs/bug392.dir/two.go b/test/fixedbugs/bug392.dir/pkg2.go
similarity index 96%
rename from test/fixedbugs/bug392.dir/two.go
rename to test/fixedbugs/bug392.dir/pkg2.go
index a9033dbb0373dc202e97de494e816ca938dc3d68..8320b2fffa2e23a0cc35095f9dd0458f773eb132 100644
--- a/test/fixedbugs/bug392.dir/two.go
+++ b/test/fixedbugs/bug392.dir/pkg2.go
@@ -5,7 +5,7 @@
 // Use the functions in one.go so that the inlined
 // forms get type-checked.
 
-package two
+package pkg2
 
 import "./one"
 
diff --git a/test/fixedbugs/bug392.dir/three.go b/test/fixedbugs/bug392.dir/pkg3.go
similarity index 62%
rename from test/fixedbugs/bug392.dir/three.go
rename to test/fixedbugs/bug392.dir/pkg3.go
index a6193bf91078ca6adaca28c40eb16090fbe891d7..402c3b083fd550d77bef5a6bb5c4e2f7a33521ed 100644
--- a/test/fixedbugs/bug392.dir/three.go
+++ b/test/fixedbugs/bug392.dir/pkg3.go
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Use the functions in one.go so that the inlined
+// Use the functions in pkg2.go so that the inlined
 // forms get type-checked.
 
-package three
+package pkg3
 
-import "./two"
+import "./pkg2"
 
-var x = two.F()
-var v = two.V
+var x = pkg2.F()
+var v = pkg2.V
diff --git a/test/fixedbugs/bug392.go b/test/fixedbugs/bug392.go
index a7a4216c4577485018b1238f3d5eb5f90dc946f2..48b79e01b894a128edb9c5c4a839674a5ead3156 100644
--- a/test/fixedbugs/bug392.go
+++ b/test/fixedbugs/bug392.go
@@ -1,4 +1,4 @@
-// $G $D/$F.dir/one.go && $G $D/$F.dir/two.go && $G $D/$F.dir/three.go
+// compiledir
 
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug415.dir/main.go b/test/fixedbugs/bug415.dir/prog.go
similarity index 100%
rename from test/fixedbugs/bug415.dir/main.go
rename to test/fixedbugs/bug415.dir/prog.go
diff --git a/test/fixedbugs/bug415.go b/test/fixedbugs/bug415.go
index fbf034218a9650582909d7c7cad47cb7400e18de..8cd4c49f24e0c99b054ac4e21c80dbaddbbdcbcc 100644
--- a/test/fixedbugs/bug415.go
+++ b/test/fixedbugs/bug415.go
@@ -1,4 +1,4 @@
-// $G $D/$F.dir/p.go && $G $D/$F.dir/main.go
+// compiledir
 
 // Copyright 2012 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style