diff --git a/go/1.15.8/disable-sigsetxid-test.patch b/go/1.15.8/disable-sigsetxid-test.patch
new file mode 100644
index 0000000..6e38462
--- /dev/null
+++ b/go/1.15.8/disable-sigsetxid-test.patch
@@ -0,0 +1,15 @@
+--- /misc/cgo/test/testdata/issue9400_linux.go.orig      2021-02-12 12:45:02.000000000 +0900
++++ /misc/cgo/test/testdata/issue9400_linux.go   2021-02-12 12:45:27.000000000 +0900
+@@ -19,9 +19,12 @@
+        "testing"
+ 
+        "cgotest/issue9400"
++       "internal/testenv"
+ )
+ 
+ func test9400(t *testing.T) {
++       testenv.SkipFlaky(t, 39857)
++
+        // We synchronize through a shared variable, so we need two procs
+        defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(2))
+ 
diff --git a/go/1.15.8/manifest.toml b/go/1.15.8/manifest.toml
index 2feae17..a763c5a 100644
--- a/go/1.15.8/manifest.toml
+++ b/go/1.15.8/manifest.toml
@@ -9,7 +9,7 @@ workingDir = "go-go1.15.8"
 configure = "echo skip"
 compile = "echo skip"
 install = "{{ .ManifestDir }}/install.sh"
-patches = ["disable-flaky-sync-test.patch", "disable-flaky-gc-test.patch", "fix-setrlimit-hang.patch"]
+patches = ["disable-flaky-sync-test.patch", "disable-flaky-gc-test.patch", "fix-setrlimit-hang.patch", "disable-sigsetxid-test.patch"]
 
 [profiles]
 [profiles.default]