diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index 0f732e6c9..45873b835 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -4,7 +4,7 @@ jobs:
       - name: IMAGE_NAME
         value: ubuntu-22.04
       - name: PYTHON_VERSION
-        value: 3.10
+        value: 3.11
       - group: certbot-common
     strategy:
       matrix:
@@ -14,6 +14,9 @@ jobs:
         linux-py39:
           PYTHON_VERSION: 3.9
           TOXENV: py39
+        linux-py310:
+          PYTHON_VERSION: 3.10
+          TOXENV: py310
         linux-py37-nopin:
           PYTHON_VERSION: 3.7
           TOXENV: py37
@@ -42,6 +45,10 @@ jobs:
           PYTHON_VERSION: 3.10
           TOXENV: integration
           ACME_SERVER: boulder-v2
+        linux-boulder-v2-py311-integration:
+          PYTHON_VERSION: 3.11
+          TOXENV: integration
+          ACME_SERVER: boulder-v2
         nginx-compat:
           TOXENV: nginx_compat
         linux-integration-rfc2136:
diff --git a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
index cf5e20c0b..c49e22bc1 100644
--- a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
@@ -1,17 +1,16 @@
 jobs:
   - job: test
     variables:
-      PYTHON_VERSION: 3.10
+      PYTHON_VERSION: 3.11
     strategy:
       matrix:
         macos-py37-cover:
           IMAGE_NAME: macOS-12
           PYTHON_VERSION: 3.7
           TOXENV: py37-cover
-        macos-py310-cover:
+        macos-cover:
           IMAGE_NAME: macOS-12
-          PYTHON_VERSION: 3.10
-          TOXENV: py310-cover
+          TOXENV: py3-cover
         windows-py37:
           IMAGE_NAME: windows-2019
           PYTHON_VERSION: 3.7
@@ -36,17 +35,14 @@ jobs:
           IMAGE_NAME: ubuntu-22.04
           PYTHON_VERSION: 3.7
           TOXENV: py37
-        linux-py310-cover:
+        linux-cover:
           IMAGE_NAME: ubuntu-22.04
-          PYTHON_VERSION: 3.10
-          TOXENV: py310-cover
-        linux-py310-lint:
+          TOXENV: py3-cover
+        linux-lint:
           IMAGE_NAME: ubuntu-22.04
-          PYTHON_VERSION: 3.10
           TOXENV: lint-posix
-        linux-py310-mypy:
+        linux-mypy:
           IMAGE_NAME: ubuntu-22.04
-          PYTHON_VERSION: 3.10
           TOXENV: mypy-posix
         linux-integration:
           IMAGE_NAME: ubuntu-22.04