diff --git a/Vagrantfile b/Vagrantfile
index c465ed73a..0f69feed2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,11 +17,11 @@ Vagrant.configure("2") do |config|
     usermod -a -G docker vagrant
     apt-get autoremove -y
 
-    curl -O https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz
-    tar -xvf go1.8.linux-amd64.tar.gz
+    curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz
+    tar -xvf go1.9.linux-amd64.tar.gz
     rm -rf /usr/local/go
     mv go /usr/local
-    rm -f go1.8.linux-amd64.tar.gz
+    rm -f go1.9.linux-amd64.tar.gz
     mkdir -p /home/vagrant/go/bin
     echo 'export PATH=$PATH:/usr/local/go/bin:/home/vagrant/go/bin' >> /home/vagrant/.bash_profile
     echo 'export GOPATH=/home/vagrant/go' >> /home/vagrant/.bash_profile
diff --git a/scripts/tendermint-builder/Dockerfile b/scripts/tendermint-builder/Dockerfile
index daf931715..0c5130c50 100644
--- a/scripts/tendermint-builder/Dockerfile
+++ b/scripts/tendermint-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.3
+FROM golang:1.9.0
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		zip \
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index 8a2702fc8..7e5cecef8 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.3
+FROM golang:1.9.0
 
 # Add testing deps for curl
 RUN echo 'deb http://httpredir.debian.org/debian testing main non-free contrib' >> /etc/apt/sources.list