diff --git a/universe/go/0002-misc-cgo-test-enable-Test9400-on-Alpine-Linux-again.patch b/universe/go/0002-misc-cgo-test-enable-Test9400-on-Alpine-Linux-again.patch
deleted file mode 100644
index cf0ba6f53a..0000000000
--- a/universe/go/0002-misc-cgo-test-enable-Test9400-on-Alpine-Linux-again.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 30d6ed7aefb50dfcbd77275d82be25e56d531801 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 7 Jun 2023 02:14:23 +0200
-Subject: [PATCH] misc/cgo/test: enable Test9400 on Alpine Linux again
-
-The underlying issue has been fixed in musl.
----
- src/cmd/cgo/internal/test/cgo_linux_test.go | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/cmd/cgo/internal/test/cgo_linux_test.go b/src/cmd/cgo/internal/test/cgo_linux_test.go
-index 3a1cf98c2a..4dafc82385 100644
---- a/src/cmd/cgo/internal/test/cgo_linux_test.go
-+++ b/src/cmd/cgo/internal/test/cgo_linux_test.go
-@@ -34,9 +34,13 @@ func Test1435(t *testing.T) { test1435(t) }
- func Test6997(t *testing.T) { test6997(t) }
- 
- func Test9400(t *testing.T) {
--	if _, err := os.Stat("/etc/alpine-release"); err == nil {
--		t.Skip("setgid is broken with musl libc - go.dev/issue/39857")
--	}
-+	// Since musl 1.2.4 these tests should no longer fail on Alpine.
-+	//
-+	// See https://github.com/golang/go/issues/39857#issuecomment-1305876934
-+	// if _, err := os.Stat("/etc/alpine-release"); err == nil {
-+	// 	t.Skip("setgid is broken with musl libc - go.dev/issue/39857")
-+	// }
-+
- 	test9400(t)
- }
- 
diff --git a/universe/go/0002-misc-cgo-test-enable-setgid-tests-on-Alpine-Linux-ag.patch b/universe/go/0002-misc-cgo-test-enable-setgid-tests-on-Alpine-Linux-ag.patch
new file mode 100644
index 0000000000..cfbda57436
--- /dev/null
+++ b/universe/go/0002-misc-cgo-test-enable-setgid-tests-on-Alpine-Linux-ag.patch
@@ -0,0 +1,52 @@
+From b10f7f53b8a2b5d050b87072672bd7dfb79d6c1e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 7 Jun 2023 23:42:05 +0200
+Subject: [PATCH] misc/cgo/test: enable setgid tests on Alpine Linux again
+
+The underlying issue has been fixed in musl.
+---
+ src/cmd/cgo/internal/test/cgo_linux_test.go | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/src/cmd/cgo/internal/test/cgo_linux_test.go b/src/cmd/cgo/internal/test/cgo_linux_test.go
+index 3defc32ffd..21b1feb5d1 100644
+--- a/src/cmd/cgo/internal/test/cgo_linux_test.go
++++ b/src/cmd/cgo/internal/test/cgo_linux_test.go
+@@ -7,7 +7,6 @@
+ package cgotest
+ 
+ import (
+-	"os"
+ 	"runtime"
+ 	"testing"
+ )
+@@ -16,9 +15,6 @@ func TestSetgid(t *testing.T) {
+ 	if runtime.GOOS == "android" {
+ 		t.Skip("unsupported on Android")
+ 	}
+-	if _, err := os.Stat("/etc/alpine-release"); err == nil {
+-		t.Skip("setgid is broken with musl libc - go.dev/issue/39857")
+-	}
+ 	testSetgid(t)
+ }
+ 
+@@ -26,9 +22,6 @@ func TestSetgidStress(t *testing.T) {
+ 	if runtime.GOOS == "android" {
+ 		t.Skip("unsupported on Android")
+ 	}
+-	if _, err := os.Stat("/etc/alpine-release"); err == nil {
+-		t.Skip("setgid is broken with musl libc - go.dev/issue/39857")
+-	}
+ 	testSetgidStress(t)
+ }
+ 
+@@ -36,9 +29,6 @@ func Test1435(t *testing.T) { test1435(t) }
+ func Test6997(t *testing.T) { test6997(t) }
+ 
+ func Test9400(t *testing.T) {
+-	if _, err := os.Stat("/etc/alpine-release"); err == nil {
+-		t.Skip("setgid is broken with musl libc - go.dev/issue/39857")
+-	}
+ 	test9400(t)
+ }
+ 
diff --git a/universe/go/APKBUILD b/universe/go/APKBUILD
index cfb56804e5..ed9cbf2a73 100644
--- a/universe/go/APKBUILD
+++ b/universe/go/APKBUILD
@@ -12,7 +12,7 @@ checkdepends="binutils-gold git git-daemon"
 subpackages="$pkgname-doc"
 source="https://go.dev/dl/go$pkgver.src.tar.gz
 	musl:0001-cmd-link-prefer-musl-s-over-glibc-s-ld.so-during-dyn.patch
-	0002-misc-cgo-test-enable-Test9400-on-Alpine-Linux-again.patch
+	0002-misc-cgo-test-enable-setgid-tests-on-Alpine-Linux-ag.patch
 	0003-go.env-Don-t-switch-Go-toolchain-version-as-directed.patch
 
 	tests-filter-overflow-gid.patch
@@ -292,7 +292,7 @@ package() {
 sha512sums="
 b6bee4a461ed91958c334b2f8b78e8f0c45f07409ba6968ae393b34d9cd21a9b1a29df357d191144e99f8ea73f491926ea0027ecbcfcaa198349e67fa33e0e3c  go1.21.1.src.tar.gz
 34dbe032c5f08dd8a7aad36fc4d54e746a876fdadc25466888a2f04f5a9d53103190ebd68d3cf978d3a041976185e30ffb25611fb577d031c159810d2d4c7c41  0001-cmd-link-prefer-musl-s-over-glibc-s-ld.so-during-dyn.patch
-bac6d16401bb37e1894eebe4a5f46b103cdd8fb6128065a90048039f819b80be84c305cda39b209d79a35a2730463c657df6afcfb471ba14397fd79994c9be99  0002-misc-cgo-test-enable-Test9400-on-Alpine-Linux-again.patch
+89ab4fbb2901d3907e9661dce877ee45b4a4ee07b964dca341235420ee08764f49aed5da1596d28c649e349af19ea49c03ab6f2c2ad7588a4cf950a619c10e9b  0002-misc-cgo-test-enable-setgid-tests-on-Alpine-Linux-ag.patch
 8061e4ef9d7dd31804bd8d98c95afa5dd82567940b3436f45f874e0419e324b49713d8a814df04617e575ec3c6155199c4661352ea8aef63ead81ca3020f3dc4  0003-go.env-Don-t-switch-Go-toolchain-version-as-directed.patch
 9f656adb00d174aeae3fc09eeeba1931a290e8cf9e1d3f5e0f232dcf121d45dba04210f88afbb3915b0d7e21dad5c165de9307f4b53e33ba718d312153391571  tests-filter-overflow-gid.patch
 6017caacf77c2911e9e882878fdaa2ed066b76b7e97b2ad776bc33d96b21cabc802966473946642c86a8f985c69adcc5e7ea61684f6d0dbacd468a6aad687229  tests-unshare-enosys.patch