diff --git a/Makefile b/Makefile
index e6317845..9083abc2 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ REPODIR := $(ORGDIR)/$(REPONAME)
 REPOPATH := $(ORGPATH)/$(REPONAME)
 
 GOPATH := $(GOBUILDDIR)
-GOVERSION := 1.8.3-alpine
+GOVERSION := 1.9.0-alpine
 
 ifndef GOOS
 	GOOS := linux
diff --git a/test/Dockerfile-arangodb-golang b/test/Dockerfile-arangodb-golang
index 2502e8d0..408f79df 100644
--- a/test/Dockerfile-arangodb-golang
+++ b/test/Dockerfile-arangodb-golang
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.8.3
+ENV GOLANG_VERSION 1.9
 
 RUN set -eux; \
 	\