diff --git a/llvm/bindings/go/build.sh b/llvm/bindings/go/build.sh
deleted file mode 100755
--- a/llvm/bindings/go/build.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -xe
-
-gollvmdir=$(dirname "$0")/llvm
-
-workdir=$gollvmdir/workdir
-llvmdir=$gollvmdir/../../..
-llvm_builddir=$workdir/llvm_build
-
-mkdir -p $llvm_builddir
-
-cmake_flags="../../../../.. $@"
-llvm_config="$llvm_builddir/bin/llvm-config"
-llvm_go="$llvm_builddir/bin/llvm-go"
-
-if test -n "`which ninja`" ; then
-  # If Ninja is available, we can speed up the build by building only the
-  # required subset of LLVM.
-  (cd $llvm_builddir && cmake -G Ninja $cmake_flags)
-  ninja -C $llvm_builddir llvm-config llvm-go
-  llvm_components="$($llvm_go print-components)"
-  llvm_buildtargets="$($llvm_config --libs $llvm_components | sed -e 's/-l//g')"
-  ninja -C $llvm_builddir $llvm_buildtargets FileCheck
-else
-  (cd $llvm_builddir && cmake $cmake_flags)
-  make -C $llvm_builddir -j4
-fi
-
-$llvm_go print-config > $gollvmdir/llvm_config.go
diff --git a/llvm/bindings/go/llvm/IRBindings.h b/llvm/bindings/go/src/llvm/IRBindings.h
rename from llvm/bindings/go/llvm/IRBindings.h
rename to llvm/bindings/go/src/llvm/IRBindings.h
diff --git a/llvm/bindings/go/llvm/IRBindings.cpp b/llvm/bindings/go/src/llvm/IRBindings.cpp
rename from llvm/bindings/go/llvm/IRBindings.cpp
rename to llvm/bindings/go/src/llvm/IRBindings.cpp
diff --git a/llvm/bindings/go/llvm/InstrumentationBindings.h b/llvm/bindings/go/src/llvm/InstrumentationBindings.h
rename from llvm/bindings/go/llvm/InstrumentationBindings.h
rename to llvm/bindings/go/src/llvm/InstrumentationBindings.h
diff --git a/llvm/bindings/go/llvm/InstrumentationBindings.cpp b/llvm/bindings/go/src/llvm/InstrumentationBindings.cpp
rename from llvm/bindings/go/llvm/InstrumentationBindings.cpp
rename to llvm/bindings/go/src/llvm/InstrumentationBindings.cpp
diff --git a/llvm/bindings/go/llvm/SupportBindings.h b/llvm/bindings/go/src/llvm/SupportBindings.h
rename from llvm/bindings/go/llvm/SupportBindings.h
rename to llvm/bindings/go/src/llvm/SupportBindings.h
diff --git a/llvm/bindings/go/llvm/SupportBindings.cpp b/llvm/bindings/go/src/llvm/SupportBindings.cpp
rename from llvm/bindings/go/llvm/SupportBindings.cpp
rename to llvm/bindings/go/src/llvm/SupportBindings.cpp
diff --git a/llvm/bindings/go/llvm/analysis.go b/llvm/bindings/go/src/llvm/analysis.go
rename from llvm/bindings/go/llvm/analysis.go
rename to llvm/bindings/go/src/llvm/analysis.go
diff --git a/llvm/bindings/go/llvm/bitreader.go b/llvm/bindings/go/src/llvm/bitreader.go
rename from llvm/bindings/go/llvm/bitreader.go
rename to llvm/bindings/go/src/llvm/bitreader.go
diff --git a/llvm/bindings/go/llvm/bitwriter.go b/llvm/bindings/go/src/llvm/bitwriter.go
rename from llvm/bindings/go/llvm/bitwriter.go
rename to llvm/bindings/go/src/llvm/bitwriter.go
diff --git a/llvm/bindings/go/llvm/dibuilder.go b/llvm/bindings/go/src/llvm/dibuilder.go
rename from llvm/bindings/go/llvm/dibuilder.go
rename to llvm/bindings/go/src/llvm/dibuilder.go
diff --git a/llvm/bindings/go/llvm/executionengine.go b/llvm/bindings/go/src/llvm/executionengine.go
rename from llvm/bindings/go/llvm/executionengine.go
rename to llvm/bindings/go/src/llvm/executionengine.go
diff --git a/llvm/bindings/go/llvm/executionengine_test.go b/llvm/bindings/go/src/llvm/executionengine_test.go
rename from llvm/bindings/go/llvm/executionengine_test.go
rename to llvm/bindings/go/src/llvm/executionengine_test.go
diff --git a/llvm/bindings/go/llvm/ir.go b/llvm/bindings/go/src/llvm/ir.go
rename from llvm/bindings/go/llvm/ir.go
rename to llvm/bindings/go/src/llvm/ir.go
diff --git a/llvm/bindings/go/llvm/ir_test.go b/llvm/bindings/go/src/llvm/ir_test.go
rename from llvm/bindings/go/llvm/ir_test.go
rename to llvm/bindings/go/src/llvm/ir_test.go
diff --git a/llvm/bindings/go/llvm/linker.go b/llvm/bindings/go/src/llvm/linker.go
rename from llvm/bindings/go/llvm/linker.go
rename to llvm/bindings/go/src/llvm/linker.go
diff --git a/llvm/bindings/go/llvm/llvm_config.go.in b/llvm/bindings/go/src/llvm/llvm_config.go.in
rename from llvm/bindings/go/llvm/llvm_config.go.in
rename to llvm/bindings/go/src/llvm/llvm_config.go.in
diff --git a/llvm/bindings/go/llvm/llvm_dep.go b/llvm/bindings/go/src/llvm/llvm_dep.go
rename from llvm/bindings/go/llvm/llvm_dep.go
rename to llvm/bindings/go/src/llvm/llvm_dep.go
--- a/llvm/bindings/go/llvm/llvm_dep.go
+++ b/llvm/bindings/go/src/llvm/llvm_dep.go
@@ -14,5 +14,3 @@
 // +build !byollvm
 
 package llvm
-
-var _ run_build_sh
diff --git a/llvm/bindings/go/llvm/string.go b/llvm/bindings/go/src/llvm/string.go
rename from llvm/bindings/go/llvm/string.go
rename to llvm/bindings/go/src/llvm/string.go
diff --git a/llvm/bindings/go/llvm/string_test.go b/llvm/bindings/go/src/llvm/string_test.go
rename from llvm/bindings/go/llvm/string_test.go
rename to llvm/bindings/go/src/llvm/string_test.go
diff --git a/llvm/bindings/go/llvm/support.go b/llvm/bindings/go/src/llvm/support.go
rename from llvm/bindings/go/llvm/support.go
rename to llvm/bindings/go/src/llvm/support.go
diff --git a/llvm/bindings/go/llvm/target.go b/llvm/bindings/go/src/llvm/target.go
rename from llvm/bindings/go/llvm/target.go
rename to llvm/bindings/go/src/llvm/target.go
diff --git a/llvm/bindings/go/llvm/transforms_coroutines.go b/llvm/bindings/go/src/llvm/transforms_coroutines.go
rename from llvm/bindings/go/llvm/transforms_coroutines.go
rename to llvm/bindings/go/src/llvm/transforms_coroutines.go
diff --git a/llvm/bindings/go/llvm/transforms_instrumentation.go b/llvm/bindings/go/src/llvm/transforms_instrumentation.go
rename from llvm/bindings/go/llvm/transforms_instrumentation.go
rename to llvm/bindings/go/src/llvm/transforms_instrumentation.go
diff --git a/llvm/bindings/go/llvm/transforms_ipo.go b/llvm/bindings/go/src/llvm/transforms_ipo.go
rename from llvm/bindings/go/llvm/transforms_ipo.go
rename to llvm/bindings/go/src/llvm/transforms_ipo.go
diff --git a/llvm/bindings/go/llvm/transforms_pmbuilder.go b/llvm/bindings/go/src/llvm/transforms_pmbuilder.go
rename from llvm/bindings/go/llvm/transforms_pmbuilder.go
rename to llvm/bindings/go/src/llvm/transforms_pmbuilder.go
diff --git a/llvm/bindings/go/llvm/transforms_scalar.go b/llvm/bindings/go/src/llvm/transforms_scalar.go
rename from llvm/bindings/go/llvm/transforms_scalar.go
rename to llvm/bindings/go/src/llvm/transforms_scalar.go
diff --git a/llvm/bindings/go/llvm/version.go b/llvm/bindings/go/src/llvm/version.go
rename from llvm/bindings/go/llvm/version.go
rename to llvm/bindings/go/src/llvm/version.go
diff --git a/llvm/test/Bindings/Go/go.test b/llvm/test/Bindings/Go/go.test
--- a/llvm/test/Bindings/Go/go.test
+++ b/llvm/test/Bindings/Go/go.test
@@ -1,4 +1,4 @@
-; RUN: llvm-go test llvm.org/llvm/bindings/go/llvm
+; RUN: CGO_CPPFLAGS="`llvm-config --cppflags`" CGO_CXXFLAGS=-std=c++14 CGO_LDFLAGS="`llvm-config --ldflags --libs --system-libs all`" go test llvm
 
 ; REQUIRES: shell
 ; UNSUPPORTED: asan, ubsan, msan
diff --git a/llvm/test/Bindings/Go/lit.local.cfg b/llvm/test/Bindings/Go/lit.local.cfg
--- a/llvm/test/Bindings/Go/lit.local.cfg
+++ b/llvm/test/Bindings/Go/lit.local.cfg
@@ -57,4 +57,5 @@
 
 config.environment['CC'] = fixup_compiler_path(config.host_cc)
 config.environment['CXX'] = fixup_compiler_path(config.host_cxx)
-config.environment['CGO_LDFLAGS'] = config.host_ldflags
+config.environment['LD_LIBRARY_PATH'] = config.llvm_shlib_dir
+config.environment['GOPATH'] = os.path.join(config.llvm_src_root, 'bindings', 'go')
diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
--- a/llvm/test/lit.cfg.py
+++ b/llvm/test/lit.cfg.py
@@ -160,7 +160,7 @@
 
 # The following tools are optional
 tools.extend([
-    ToolSubst('llvm-go', unresolved='ignore'),
+    ToolSubst('go', unresolved='ignore'),
     ToolSubst('llvm-mt', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch3', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch4', unresolved='ignore'),
diff --git a/llvm/utils/lit/lit/llvm/subst.py b/llvm/utils/lit/lit/llvm/subst.py
--- a/llvm/utils/lit/lit/llvm/subst.py
+++ b/llvm/utils/lit/lit/llvm/subst.py
@@ -23,7 +23,7 @@
 
         if self.name == 'llc' and os.environ.get('LLVM_ENABLE_MACHINE_VERIFIER') == '1':
             command += ' -verify-machineinstrs'
-        elif self.name == 'llvm-go':
+        elif self.name == 'go':
             exe = getattr(config.config, 'go_executable', None)
             if exe:
                 command += ' go=' + exe