diff --git a/test/e2e/e2e-echo.sh b/test/e2e/e2e-echo.sh
index d41a6438c6..21a375add2 100755
--- a/test/e2e/e2e-echo.sh
+++ b/test/e2e/e2e-echo.sh
@@ -5,7 +5,10 @@
 set -o errexit
 
 source $(dirname $0)/e2e-paths.env
+source $(dirname $0)/machine.env
 
 echo REPO_ROOT=$REPO_ROOT
 echo BASE=$BASE
 echo GOBIN=$GOBIN
+echo OS=$OS
+echo ARCH=$ARCH
diff --git a/test/e2e/e2e-golang.sh b/test/e2e/e2e-golang.sh
index 5698b6208a..b3a98ed183 100755
--- a/test/e2e/e2e-golang.sh
+++ b/test/e2e/e2e-golang.sh
@@ -3,14 +3,15 @@
 set -o errexit
 
 source $(dirname $0)/e2e-paths.env
+source $(dirname $0)/machine.env
 
 GO_VERSION=1.11.4
 
 echo ">>> Installing go ${GO_VERSION} to $GOBASE/go"
-if ! [ -f "go${GO_VERSION}.linux-amd64.tar.gz" ]; then
-    curl -O https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz
+if ! [ -f "go${GO_VERSION}.${OS}-${ARCH}.tar.gz" ]; then
+    curl -O https://storage.googleapis.com/golang/go${GO_VERSION}.${OS}-${ARCH}.tar.gz
 fi
-tar -xf go1.11.4.linux-amd64.tar.gz
+tar -xf go1.11.4.${OS}-${ARCH}.tar.gz
 rm -rf $GOBASE/go
 mkdir -p $GOBASE
 mv go $GOBASE/
diff --git a/test/e2e/machine.env b/test/e2e/machine.env
new file mode 100644
index 0000000000..73c46572a9
--- /dev/null
+++ b/test/e2e/machine.env
@@ -0,0 +1,19 @@
+# not for execution; sets some variables up
+
+ARCH=$(uname -m)
+case $ARCH in
+    armv5*) ARCH="armv5";;
+    armv6*) ARCH="armv6";;
+    armv7*) ARCH="arm";;
+    aarch64) ARCH="arm64";;
+    x86) ARCH="386";;
+    x86_64) ARCH="amd64";;
+    i686) ARCH="386";;
+    i386) ARCH="386";;
+esac
+
+OS=$(echo `uname`|tr '[:upper:]' '[:lower:]')
+case "$OS" in
+    # Minimalist GNU for Windows
+    mingw*) OS='windows';;
+esac