diff --git a/.zuul.yaml b/.zuul.yaml
index 84979740..e88a6639 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,23 +4,12 @@
     nodeset: ubuntu-bionic
 
 - job:
-    name: nox-py36-gerrit-371
-    parent: nox-py36-gerrit-default
+    name: nox-py312-gerrit-395
+    parent: nox-py312
+    nodeset: ubuntu-noble
     vars:
       nox_environment:
-        WAR_URL: 'https://gerrit-releases.storage.googleapis.com/gerrit-3.7.1.war'
-
-- job:
-    name: nox-py311-gerrit-default
-    parent: nox-py311
-    nodeset: ubuntu-jammy
-
-- job:
-    name: nox-py311-gerrit-371
-    parent: nox-py311-gerrit-default
-    vars:
-      nox_environment:
-        WAR_URL: 'https://gerrit-releases.storage.googleapis.com/gerrit-3.7.1.war'
+        WAR_URL: 'https://gerrit-releases.storage.googleapis.com/gerrit-3.9.5.war'
 
 - project:
     vars:
@@ -32,9 +21,7 @@
         - build-python-release
         - nox-linters
         - nox-py36-gerrit-default
-        - nox-py36-gerrit-371
-        - nox-py311-gerrit-default
-        - nox-py311-gerrit-371
+        - nox-py312-gerrit-395
     gate:
       jobs: *jobs
     promote:
diff --git a/bindep.txt b/bindep.txt
index 9c35486d..a3dc7aa6 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -2,4 +2,5 @@
 # install and tests; see http://docs.opendev.org/opendev/bindep/ for additional
 # information.
 
-openjdk-11-jdk [test]
+openjdk-11-jdk [test platform:ubuntu-bionic]
+openjdk-17-jdk [test platform:ubuntu-noble]
diff --git a/git_review/tests/test_git_review.py b/git_review/tests/test_git_review.py
index b0eaa5c1..6533f22d 100644
--- a/git_review/tests/test_git_review.py
+++ b/git_review/tests/test_git_review.py
@@ -19,7 +19,6 @@ import json
 import os
 import shutil
 import tempfile
-import testtools
 
 from git_review import tests
 from git_review.tests import utils
@@ -431,12 +430,7 @@ class GitReviewTestCase(tests.BaseGitReviewTestCase):
                              'maint', head_1)
         self._run_git('fetch')
 
-        br_out = self._run_git('checkout',
-                               '-b', 'test_branch', 'origin/maint')
-        expected_track = (".*\nBranch '?test_branch'? set up to track remote "
-                          "branch '?maint'? from '?origin'?.")
-        track_matcher = testtools.matchers.MatchesRegex(expected_track)
-        self.assertThat(br_out, track_matcher)
+        self._run_git('checkout', '-b', 'test_branch', 'origin/maint')
         branches = self._run_git('branch', '-a')
         expected_branch = '* test_branch'
         observed = branches.split('\n')