diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg
index f299d0f4451c..7e80a7f94a77 100644
--- a/llvm/test/lit.cfg
+++ b/llvm/test/lit.cfg
@@ -240,6 +240,8 @@ def find_tool_substitution(pattern):
        'LLVM_ENABLE_MACHINE_VERIFIER' in os.environ and
        os.environ['LLVM_ENABLE_MACHINE_VERIFIER'] == "1"):
         tool_path += " -verify-machineinstrs"
+    if (tool_name == "llvm-go"):
+        tool_path += " go=" + config.go_executable
     return tool_name, tool_path, tool_pipe