diff --git a/src/pkg/runtime/parfor_test.go b/src/pkg/runtime/parfor_test.go
index 055c134a93..0547db0209 100644
--- a/src/pkg/runtime/parfor_test.go
+++ b/src/pkg/runtime/parfor_test.go
@@ -92,6 +92,11 @@ func TestParForSetup(t *testing.T) {
 
 // Test parallel parallelfor.
 func TestParForParallel(t *testing.T) {
+	if GOARCH != "amd64" {
+		t.Log("temporarily disabled, see http://golang.org/issue/4155")
+		return
+	}
+
 	N := uint64(1e7)
 	if testing.Short() {
 		N /= 10
@@ -114,4 +119,7 @@ func TestParForParallel(t *testing.T) {
 			t.Fatalf("Wrong element %d: %d", i, data[i])
 		}
 	}
+
+	data, desc = nil, nil
+	GC()
 }