diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90985b8..033e67c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,18 +49,23 @@ before_script:
 
 ruby-2.3-golang-1.8-git-2.14 test: *test_custom
 ruby-2.3-golang-1.8-git-2.9 test: *test_custom
+ruby-2.3-golang-1.9-git-2.16 test: *test_custom
 ruby-2.3-golang-1.9-git-2.14 test: *test_custom
 ruby-2.3-golang-1.9-git-2.9 test: *test_custom
 ruby-2.3-golang-1.10-git-2.14 test: *test_custom
 ruby-2.3-golang-1.10-git-2.9 test: *test_custom
+ruby-2.3-golang-1.10-git-2.16 test: *test_custom
 ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
+ruby-2.3.6-golang-1.9-git-2.16-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 golang-1.8.6-git-2.9.0 test: *test_custom
 golang-1.8.6-git-2.14 test: *test_custom
 golang-1.9-git-2.9.0 test: *test_custom
 golang-1.9-git-2.14 test: *test_custom
+golang-1.9-git-2.16 test: *test_custom
 golang-1.10-git-2.9.0 test: *test_custom
 golang-1.10-git-2.14 test: *test_custom
+golang-1.10-git-2.16 test: *test_custom
 node-8.9-chrome-64.0-yarn-1.2 test: *test_custom
 
 www-gitlab-com test: *test_build
@@ -79,18 +84,23 @@ sitespeed-gitlab test: *test_build
 
 ruby-2.3-golang-1.8.6-git-2.14: *build_and_deploy_custom
 ruby-2.3-golang-1.8.6-git-2.9: *build_and_deploy_custom
+ruby-2.3-golang-1.9-git-2.16: *build_and_deploy_custom
 ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom
 ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom
+ruby-2.3-golang-1.10-git-2.16: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.14: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom
 ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
+ruby-2.3.6-golang-1.9-git-2.16-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 golang-1.8.6-git-2.9.0: *build_and_deploy_custom
 golang-1.8.6-git-2.14: *build_and_deploy_custom
 golang-1.9-git-2.9.0: *build_and_deploy_custom
 golang-1.9-git-2.14: *build_and_deploy_custom
+golang-1.9-git-2.16: *build_and_deploy_custom
 golang-1.10-git-2.9.0: *build_and_deploy_custom
 golang-1.10-git-2.14: *build_and_deploy_custom
+golang-1.10-git-2.16: *build_and_deploy_custom
 node-8.9-chrome-64.0-yarn-1.2: *build_and_deploy_custom
 
 www-gitlab-com: *build_and_deploy
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 756239e..5fdf32c 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -60,6 +60,10 @@ function print_git_args() {
             GIT_VERSION=2.14.3
             GIT_DOWNLOAD_SHA256=023ffff6d3ba8a1bea779dfecc0ed0bb4ad68ab8601d14435dd8c08416f78d7f
             ;;
+        2.16)
+            GIT_VERSION=2.16.2
+            GIT_DOWNLOAD_SHA256=9acc4339b7a2ab484eea69d705923271682b7058015219cf5a7e6ed8dee5b5fb
+            ;;
         *) echo "Unknown git version $1"; exit 1;
     esac