diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16f6193..9e866aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,6 @@ before_script:
 
 # Tests
 
-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
@@ -64,8 +62,7 @@ ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test
 ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.3.7-golang-1.9-git-2.17-chrome-65.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
+ruby-2.4.1-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 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
@@ -92,18 +89,21 @@ sitespeed-gitlab test: *test_build
 
 # Builds
 
-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
+# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
 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
+
+# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
+ruby-2.4.1-golang-1.9-git-2.17-chrome-65.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