diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba51590..34f90e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,8 +30,8 @@ before_script:
 ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build
 ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
 ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
-ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
 ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
+ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
 ruby-2.3-static-analyses test: *test_build
 www-gitlab-com test: *test_build
 doc-gitlab-com test: *test_build
@@ -45,8 +45,8 @@ 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
 ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
-ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy
 ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
+ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy
 ruby-2.3-static-analyses: *build_and_deploy
 www-gitlab-com: *build_and_deploy
 doc-gitlab-com: *build_and_deploy
diff --git a/Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 b/Dockerfile.ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
similarity index 79%
rename from Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
rename to Dockerfile.ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
index 2db22a9..1699da7 100644
--- a/Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
+++ b/Dockerfile.ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
@@ -4,8 +4,11 @@ ADD / /
 RUN /scripts/install-essentials
 RUN /scripts/install-phantomjs 2.1.1
 RUN /scripts/install-node
+RUN /scripts/install-golang
 RUN /scripts/install-postgresql
 
+ENV PATH /usr/local/go/bin:$PATH
+
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en