diff --git a/test/fixedbugs/bug110.go b/test/fixedbugs/bug110.go
index 4e43d1c01b8..5528ba3f16d 100644
--- a/test/fixedbugs/bug110.go
+++ b/test/fixedbugs/bug110.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A || echo BUG: const bug
+// build
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug114.go b/test/fixedbugs/bug114.go
index 974b7cf26e5..99e66a2ddc1 100644
--- a/test/fixedbugs/bug114.go
+++ b/test/fixedbugs/bug114.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A && (./$A.out || echo BUG: bug114 failed)
+// run
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug155.go b/test/fixedbugs/bug155.go
index 312c8e6a963..8872e978daa 100644
--- a/test/fixedbugs/bug155.go
+++ b/test/fixedbugs/bug155.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A || echo BUG: bug155
+// build
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug167.go b/test/fixedbugs/bug167.go
index 33eb3cb1a95..3a50e6ff0c1 100644
--- a/test/fixedbugs/bug167.go
+++ b/test/fixedbugs/bug167.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A || echo BUG: bug167
+// build
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug183.go b/test/fixedbugs/bug183.go
index 7fd6e4942f6..dc9f5356e03 100644
--- a/test/fixedbugs/bug183.go
+++ b/test/fixedbugs/bug183.go
@@ -1,4 +1,4 @@
-//errchk $G $D/$F.go
+// errorcheck
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/sieve.go b/test/sieve.go
index 4fa1115824f..31c4ed5c05e 100644
--- a/test/sieve.go
+++ b/test/sieve.go
@@ -1,4 +1,6 @@
-// $G $F.go && $L $F.$A  # don't run it - goes forever
+// build
+
+// don't run it - goes forever
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/solitaire.go b/test/solitaire.go
index 473a1d12d7d..99c194f5bba 100644
--- a/test/solitaire.go
+++ b/test/solitaire.go
@@ -1,4 +1,6 @@
-// $G $F.go && $L $F.$A  # don't run it - produces too much output
+// build
+
+// don't run it - produces too much output
 
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style