diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index afe9a66..3fa6e13 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -6,7 +6,8 @@
         - test-gerrit-plugin-build
         - test-gerrit-build-master
         - test-gerrit-build-stable-3.5
-        - test-gerrit-build-stable-3.4
-        - test-gerrit-build-stable-3.3
+        - test-gerrit-build-stable-3.6
+        - test-gerrit-build-stable-3.7
+        - test-gerrit-build-stable-3.8
         - test-gitiles-build-master
         - test-install-build-essential
diff --git a/zuul.d/test-jobs.yaml b/zuul.d/test-jobs.yaml
index 767de07..064bee2 100644
--- a/zuul.d/test-jobs.yaml
+++ b/zuul.d/test-jobs.yaml
@@ -63,10 +63,11 @@
       - roles/copy-plugin-deps/.*
       - playbooks/gerrit/.*
 
+# TODO remove unsupported stable gerrit builds.
 - job:
-    name: test-gerrit-build-stable-3.5
+    name: test-gerrit-build-stable-3.3
     parent: test-gerrit-build-master
-    override-checkout: stable-3.5
+    override-checkout: stable-3.3
 
 - job:
     name: test-gerrit-build-stable-3.4
@@ -74,9 +75,24 @@
     override-checkout: stable-3.4
 
 - job:
-    name: test-gerrit-build-stable-3.3
+    name: test-gerrit-build-stable-3.5
     parent: test-gerrit-build-master
-    override-checkout: stable-3.3
+    override-checkout: stable-3.5
+
+- job:
+    name: test-gerrit-build-stable-3.6
+    parent: test-gerrit-build-master
+    override-checkout: stable-3.6
+
+- job:
+    name: test-gerrit-build-stable-3.7
+    parent: test-gerrit-build-master
+    override-checkout: stable-3.7
+
+- job:
+    name: test-gerrit-build-stable-3.8
+    parent: test-gerrit-build-master
+    override-checkout: stable-3.8
 
 - job:
     name: test-gitiles-build-master