--- libgo/go/net/smtp/smtp_test.go.orig	2020-03-04 19:30:03.000000000 +1100
+++ libgo/go/net/smtp/smtp_test.go	2020-09-08 16:03:06.187552000 +1000
@@ -680,6 +680,9 @@
 `
 
 func TestTLSClient(t *testing.T) {
+	if runtime.GOOS == "bsdsunix" && runtime.GOARCH == "amd64" {
+		testenv.SkipFlaky(t, 19229)
+	}
 	if runtime.GOOS == "freebsd" && runtime.GOARCH == "amd64" {
 		testenv.SkipFlaky(t, 19229)
 	}