diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
index 170c82df0..ea48e404f 100644
--- a/contrib/Dockerfile.test
+++ b/contrib/Dockerfile.test
@@ -6,20 +6,22 @@
 # 3.) $ make binaries install test
 #
 
+ARG GOLANG_VERSION=1.11
+
 # Install proto3
-FROM golang:1.11 AS proto3
+FROM golang:${GOLANG_VERSION} AS proto3
 RUN apt-get update && apt-get install -y autoconf automake g++ libtool unzip
 COPY script/setup/install-protobuf install-protobuf
 RUN ./install-protobuf
 
 # Install runc
-FROM golang:1.11 AS runc
+FROM golang:${GOLANG_VERSION} AS runc
 RUN apt-get update && apt-get install -y curl libseccomp-dev
 COPY vendor.conf /go/src/github.com/containerd/containerd/vendor.conf
 COPY script/setup/install-runc install-runc
 RUN ./install-runc
 
-FROM golang:1.11
+FROM golang:${GOLANG_VERSION} AS dev
 RUN apt-get update && apt-get install -y btrfs-tools gcc git libseccomp-dev make xfsprogs
 
 COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc