diff --git a/go/private/rules/test.bzl b/go/private/rules/test.bzl
index 6cf3ac7167..14cea78654 100644
--- a/go/private/rules/test.bzl
+++ b/go/private/rules/test.bzl
@@ -118,6 +118,7 @@ def _go_test_impl(ctx):
         mnemonic = "GoTestGenTest",
         executable = go.toolchain._builder,
         arguments = [arguments],
+        toolchain = GO_TOOLCHAIN,
     )
 
     test_gc_linkopts = gc_linkopts(ctx)
diff --git a/proto/compiler.bzl b/proto/compiler.bzl
index 1d66493989..b39028ee0b 100644
--- a/proto/compiler.bzl
+++ b/proto/compiler.bzl
@@ -130,6 +130,7 @@ def go_proto_compile(go, compiler, protos, imports, importpath):
         progress_message = "Generating into %s" % go_srcs[0].dirname,
         mnemonic = "GoProtocGen",
         executable = compiler.internal.go_protoc,
+        toolchain = GO_TOOLCHAIN,
         arguments = [args],
         env = go.env,
         # We may need the shell environment (potentially augmented with --action_env)