diff --git a/base/comps/components-full.toml b/base/comps/components-full.toml
index 2f4a3832750..5c89f2aad24 100644
--- a/base/comps/components-full.toml
+++ b/base/comps/components-full.toml
@@ -532,7 +532,6 @@
 [components.gnustep-make]
 [components.go-vendor-tools]
 [components.gobject-introspection]
-[components.golang]
 [components.golang-github-burntsushi-toml]
 [components.golang-github-cpuguy83-md2man]
 [components.golang-github-evanw-esbuild]
diff --git a/base/comps/golang/golang.comp.toml b/base/comps/golang/golang.comp.toml
new file mode 100644
index 00000000000..49bcf1d50ea
--- /dev/null
+++ b/base/comps/golang/golang.comp.toml
@@ -0,0 +1,9 @@
+[components.golang]
+# Override to pick up golang-1.25.8-1.fc43, which fixes an expired TLS test
+# certificate in net/smtp that causes %check failures after 2026-03-18.
+# Upstream: https://github.com/golang/go/issues/77504
+# Backport: https://github.com/golang/go/issues/77531 (Go 1.25.8)
+# Fedora commit: https://src.fedoraproject.org/rpms/golang/c/e0faaabdb215feb6be2b3232f480a03ce76ca132?branch=f43
+# TODO: Drop this override once the default Fedora 43 snapshot
+# in distro/azurelinux.distro.toml advances past this commit.
+spec = { type = "upstream", upstream-distro = { name = "fedora", version = "43" }, upstream-commit = "e0faaabdb215feb6be2b3232f480a03ce76ca132" }