diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index dded4081a..e1723f8a4 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -16,16 +16,16 @@ jobs:
           PYTHON_VERSION: 3.7
           TOXENV: py37
           CERTBOT_NO_PIN: 1
-        linux-boulder-v1-integration-certbot:
+        linux-boulder-v1-integration-certbot-oldest:
           TOXENV: integration-certbot-oldest
           ACME_SERVER: boulder-v1
-        linux-boulder-v2-integration-certbot:
+        linux-boulder-v2-integration-certbot-oldest:
           TOXENV: integration-certbot-oldest
           ACME_SERVER: boulder-v2
-        linux-boulder-v1-integration-nginx:
+        linux-boulder-v1-integration-nginx-oldest:
           TOXENV: integration-nginx-oldest
           ACME_SERVER: boulder-v1
-        linux-boulder-v2-integration-nginx:
+        linux-boulder-v2-integration-nginx-oldest:
           TOXENV: integration-nginx-oldest
           ACME_SERVER: boulder-v2
         linux-boulder-v1-py27-integration:
diff --git a/snap/local/build.sh b/snap/local/build.sh
index c296246e2..bbe5ba323 100755
--- a/snap/local/build.sh
+++ b/snap/local/build.sh
@@ -2,7 +2,7 @@
 # Cross-compile the Certbot snap from local sources for the specified architecture,
 # and install it if this architecture is also the the current machine one.
 # This script is designed for CI tests purpose.
-# Usage: build_and_install.sh [amd64,arm64,armhf]
+# Usage: build.sh [amd64,arm64,armhf]
 set -ex
 
 SNAP_ARCH=$1