diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 197ba19..a1485c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,10 @@ www-gitlab-com test: *test_build
 doc-gitlab-com test: *test_build
 terraform-0.1 test: *test_build
 gitlab-qa test: *test_build
+golang-1.5-git-2.8.4 test: *test_build
+golang-1.6-git-2.8.4 test: *test_build
+golang-1.7-git-2.8.4 test: *test_build
+golang-1.8-git-2.8.4 test: *test_build
 
 ruby-2.1-git-2.7-phantomjs-2.1: *build_and_deploy
 ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy
@@ -44,3 +48,7 @@ www-gitlab-com: *build_and_deploy
 doc-gitlab-com: *build_and_deploy
 terraform-0.1: *build_and_deploy
 gitlab-qa: *build_and_deploy
+golang-1.5-git-2.8.4: *build_and_deploy
+golang-1.6-git-2.8.4: *build_and_deploy
+golang-1.7-git-2.8.4: *build_and_deploy
+golang-1.8-git-2.8.4: *build_and_deploy
diff --git a/Dockerfile.golang-1.5-git-2.8.4 b/Dockerfile.golang-1.5-git-2.8.4
new file mode 100644
index 0000000..94d0078
--- /dev/null
+++ b/Dockerfile.golang-1.5-git-2.8.4
@@ -0,0 +1,16 @@
+FROM golang:1.5
+
+ENV GIT_VERSION 2.8.4
+ENV GIT_DOWNLOAD_URL https://www.kernel.org/pub/software/scm/git/git-$GIT_VERSION.tar.gz
+ENV GIT_DOWNLOAD_SHA256 626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301
+
+# Install Build-deps
+RUN apt-get update && apt-get install -y \
+    dh-autoreconf libcurl4-gnutls-dev libexpat1-dev \
+    gettext libz-dev libssl-dev
+
+ADD . $PWD
+
+RUN scripts/install-golang
+
+ENV PATH /usr/local/bin:$PATH
diff --git a/Dockerfile.golang-1.6-git-2.8.4 b/Dockerfile.golang-1.6-git-2.8.4
new file mode 100644
index 0000000..9e1c136
--- /dev/null
+++ b/Dockerfile.golang-1.6-git-2.8.4
@@ -0,0 +1,16 @@
+FROM golang:1.6
+
+ENV GIT_VERSION 2.8.4
+ENV GIT_DOWNLOAD_URL https://www.kernel.org/pub/software/scm/git/git-$GIT_VERSION.tar.gz
+ENV GIT_DOWNLOAD_SHA256 626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301
+
+# Install Build-deps
+RUN apt-get update && apt-get install -y \
+    dh-autoreconf libcurl4-gnutls-dev libexpat1-dev \
+    gettext libz-dev libssl-dev
+
+ADD . $PWD
+
+RUN scripts/install-golang
+
+ENV PATH /usr/local/bin:$PATH
diff --git a/Dockerfile.golang-1.7-git-2.8.4 b/Dockerfile.golang-1.7-git-2.8.4
new file mode 100644
index 0000000..efa63af
--- /dev/null
+++ b/Dockerfile.golang-1.7-git-2.8.4
@@ -0,0 +1,16 @@
+FROM golang:1.7
+
+ENV GIT_VERSION 2.8.4
+ENV GIT_DOWNLOAD_URL https://www.kernel.org/pub/software/scm/git/git-$GIT_VERSION.tar.gz
+ENV GIT_DOWNLOAD_SHA256 626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301
+
+# Install Build-deps
+RUN apt-get update && apt-get install -y \
+    dh-autoreconf libcurl4-gnutls-dev libexpat1-dev \
+    gettext libz-dev libssl-dev
+
+ADD . $PWD
+
+RUN scripts/install-golang
+
+ENV PATH /usr/local/bin:$PATH
diff --git a/Dockerfile.golang-1.8-git-2.8.4 b/Dockerfile.golang-1.8-git-2.8.4
new file mode 100644
index 0000000..e008e8e
--- /dev/null
+++ b/Dockerfile.golang-1.8-git-2.8.4
@@ -0,0 +1,16 @@
+FROM golang:1.8
+
+ENV GIT_VERSION 2.8.4
+ENV GIT_DOWNLOAD_URL https://www.kernel.org/pub/software/scm/git/git-$GIT_VERSION.tar.gz
+ENV GIT_DOWNLOAD_SHA256 626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301
+
+# Install Build-deps
+RUN apt-get update && apt-get install -y \
+    dh-autoreconf libcurl4-gnutls-dev libexpat1-dev \
+    gettext libz-dev libssl-dev
+
+ADD . $PWD
+
+RUN scripts/install-golang
+
+ENV PATH /usr/local/bin:$PATH
diff --git a/scripts/install-golang b/scripts/install-golang
new file mode 100755
index 0000000..7231150
--- /dev/null
+++ b/scripts/install-golang
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+mkdir build \
+	&& curl -fsSL "$GIT_DOWNLOAD_URL" -o git.tar.gz \
+	&& echo "$GIT_DOWNLOAD_SHA256 git.tar.gz" | sha256sum -c - \
+	&& tar -C build -xzf git.tar.gz \
+	&& cd build/git-$GIT_VERSION \
+	&& chmod +x configure \
+	&& ./configure \
+	&& make all \
+	&& make install PREFIX=/usr/local \
+	&& cd ../.. \
+	&& rm -rf build \
+	&& rm git.tar.gz