diff --git a/.travis.yml b/.travis.yml
index 624205f10..6742bcc06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,195 +80,195 @@ snap-config: &snap-config
 
 matrix:
   include:
-    # Main test suite
-    - stage: "Test"
-      python: "2.7"
-      env: ACME_SERVER=pebble TOXENV=integration
-      <<: *not-on-master
-
-    # As documented at
-    # https://docs.travis-ci.com/user/build-stages/#how-to-define-build-stages,
-    # the previous stage will be automatically applied to all subsequent jobs
-    # until a new stage is defined.
-
-    # This job is always executed, including on master
-    - python: "3.8"
-      env: TOXENV=py38-cover FYI="py38 tests + code coverage"
-
-    - python: "3.7"
-      env: TOXENV=lint
-      <<: *not-on-master
-    - python: "3.5"
-      env: TOXENV=mypy
-      <<: *not-on-master
-    - python: "2.7"
-      # Ubuntu Trusty or older must be used because the oldest version of
-      # cryptography we support cannot be compiled against the version of
-      # OpenSSL in Xenial or newer.
-      dist: trusty
-      env: TOXENV='py27-{acme,apache,apache-v2,certbot,dns,nginx}-oldest'
-      <<: *not-on-master
-    - python: "2.7"
-      env: TOXENV=py27
-      <<: *not-on-master
-    - python: "3.5"
-      env: TOXENV=py35
-      <<: *not-on-master
-    - sudo: required
-      env: TOXENV=apache_compat
-      services: docker
-      addons:
-      <<: *not-on-master
-    - sudo: required
-      env: TOXENV=le_auto_xenial
-      services: docker
-      <<: *not-on-master
-    - python: "2.7"
-      env: TOXENV=apacheconftest-with-pebble
-      <<: *not-on-master
-    - python: "2.7"
-      env: TOXENV=nginxroundtrip
-      <<: *not-on-master
-
-    # Extended test suite on cron jobs and pushes to tested branches other than master
-    - sudo: required
-      env: TOXENV=nginx_compat
-      services: docker
-      addons:
-      <<: *extended-test-suite
-    - python: "3.7"
-      env:
-        - TOXENV=travis-test-farm-apache2
-        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
-      <<: *extended-test-suite
-    - python: "3.7"
-      env:
-        - TOXENV=travis-test-farm-leauto-upgrades
-        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
-      git:
-        depth: false  # This is needed to have the history to checkout old versions of certbot-auto.
-      <<: *extended-test-suite
-    - python: "3.7"
-      env:
-        - TOXENV=travis-test-farm-certonly-standalone
-        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
-      <<: *extended-test-suite
-    - python: "3.7"
-      env:
-        - TOXENV=travis-test-farm-sdists
-        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
-      <<: *extended-test-suite
-    - python: "3.7"
-      env: TOXENV=py37 CERTBOT_NO_PIN=1
-      <<: *extended-test-suite
-    - python: "2.7"
-      env: ACME_SERVER=boulder-v1 TOXENV=integration
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "2.7"
-      env: ACME_SERVER=boulder-v2 TOXENV=integration
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "2.7"
-      env: ACME_SERVER=boulder-v1 TOXENV=integration-certbot-oldest
-      # Ubuntu Trusty or older must be used because the oldest version of
-      # cryptography we support cannot be compiled against the version of
-      # OpenSSL in Xenial or newer.
-      dist: trusty
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "2.7"
-      env: ACME_SERVER=boulder-v2 TOXENV=integration-certbot-oldest
-      # Ubuntu Trusty or older must be used because the oldest version of
-      # cryptography we support cannot be compiled against the version of
-      # OpenSSL in Xenial or newer.
-      dist: trusty
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "2.7"
-      env: ACME_SERVER=boulder-v1 TOXENV=integration-nginx-oldest
-      # Ubuntu Trusty or older must be used because the oldest version of
-      # cryptography we support cannot be compiled against the version of
-      # OpenSSL in Xenial or newer.
-      dist: trusty
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "2.7"
-      env: ACME_SERVER=boulder-v2 TOXENV=integration-nginx-oldest
-      # Ubuntu Trusty or older must be used because the oldest version of
-      # cryptography we support cannot be compiled against the version of
-      # OpenSSL in Xenial or newer.
-      dist: trusty
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "3.6"
-      env: TOXENV=py36
-      <<: *extended-test-suite
-    - python: "3.7"
-      env: TOXENV=py37
-      <<: *extended-test-suite
-    - python: "3.5"
-      env: ACME_SERVER=boulder-v1 TOXENV=integration
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "3.5"
-      env: ACME_SERVER=boulder-v2 TOXENV=integration
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "3.6"
-      env: ACME_SERVER=boulder-v1 TOXENV=integration
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "3.6"
-      env: ACME_SERVER=boulder-v2 TOXENV=integration
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "3.7"
-      env: ACME_SERVER=boulder-v1 TOXENV=integration
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "3.7"
-      env: ACME_SERVER=boulder-v2 TOXENV=integration
-      sudo: required
-      services: docker
-      <<: *extended-test-suite
-    - python: "3.8"
-      env: ACME_SERVER=boulder-v1 TOXENV=integration
-      <<: *extended-test-suite
-    - python: "3.8"
-      env: ACME_SERVER=boulder-v2 TOXENV=integration
-      <<: *extended-test-suite
-    - sudo: required
-      env: TOXENV=le_auto_jessie
-      services: docker
-      <<: *extended-test-suite
-    - sudo: required
-      env: TOXENV=le_auto_centos6
-      services: docker
-      <<: *extended-test-suite
-    - sudo: required
-      env: TOXENV=le_auto_oraclelinux6
-      services: docker
-      <<: *extended-test-suite
-    - sudo: required
-      env: TOXENV=docker_dev
-      services: docker
-      addons:
-        apt:
-          packages:  # don't install nginx and apache
-            - libaugeas0
-      <<: *extended-test-suite
+#    # Main test suite
+#    - stage: "Test"
+#      python: "2.7"
+#      env: ACME_SERVER=pebble TOXENV=integration
+#      <<: *not-on-master
+#
+#    # As documented at
+#    # https://docs.travis-ci.com/user/build-stages/#how-to-define-build-stages,
+#    # the previous stage will be automatically applied to all subsequent jobs
+#    # until a new stage is defined.
+#
+#    # This job is always executed, including on master
+#    - python: "3.8"
+#      env: TOXENV=py38-cover FYI="py38 tests + code coverage"
+#
+#    - python: "3.7"
+#      env: TOXENV=lint
+#      <<: *not-on-master
+#    - python: "3.5"
+#      env: TOXENV=mypy
+#      <<: *not-on-master
+#    - python: "2.7"
+#      # Ubuntu Trusty or older must be used because the oldest version of
+#      # cryptography we support cannot be compiled against the version of
+#      # OpenSSL in Xenial or newer.
+#      dist: trusty
+#      env: TOXENV='py27-{acme,apache,apache-v2,certbot,dns,nginx}-oldest'
+#      <<: *not-on-master
+#    - python: "2.7"
+#      env: TOXENV=py27
+#      <<: *not-on-master
+#    - python: "3.5"
+#      env: TOXENV=py35
+#      <<: *not-on-master
+#    - sudo: required
+#      env: TOXENV=apache_compat
+#      services: docker
+#      addons:
+#      <<: *not-on-master
+#    - sudo: required
+#      env: TOXENV=le_auto_xenial
+#      services: docker
+#      <<: *not-on-master
+#    - python: "2.7"
+#      env: TOXENV=apacheconftest-with-pebble
+#      <<: *not-on-master
+#    - python: "2.7"
+#      env: TOXENV=nginxroundtrip
+#      <<: *not-on-master
+#
+#    # Extended test suite on cron jobs and pushes to tested branches other than master
+#    - sudo: required
+#      env: TOXENV=nginx_compat
+#      services: docker
+#      addons:
+#      <<: *extended-test-suite
+#    - python: "3.7"
+#      env:
+#        - TOXENV=travis-test-farm-apache2
+#        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
+#      <<: *extended-test-suite
+#    - python: "3.7"
+#      env:
+#        - TOXENV=travis-test-farm-leauto-upgrades
+#        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
+#      git:
+#        depth: false  # This is needed to have the history to checkout old versions of certbot-auto.
+#      <<: *extended-test-suite
+#    - python: "3.7"
+#      env:
+#        - TOXENV=travis-test-farm-certonly-standalone
+#        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
+#      <<: *extended-test-suite
+#    - python: "3.7"
+#      env:
+#        - TOXENV=travis-test-farm-sdists
+#        - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
+#      <<: *extended-test-suite
+#    - python: "3.7"
+#      env: TOXENV=py37 CERTBOT_NO_PIN=1
+#      <<: *extended-test-suite
+#    - python: "2.7"
+#      env: ACME_SERVER=boulder-v1 TOXENV=integration
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "2.7"
+#      env: ACME_SERVER=boulder-v2 TOXENV=integration
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "2.7"
+#      env: ACME_SERVER=boulder-v1 TOXENV=integration-certbot-oldest
+#      # Ubuntu Trusty or older must be used because the oldest version of
+#      # cryptography we support cannot be compiled against the version of
+#      # OpenSSL in Xenial or newer.
+#      dist: trusty
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "2.7"
+#      env: ACME_SERVER=boulder-v2 TOXENV=integration-certbot-oldest
+#      # Ubuntu Trusty or older must be used because the oldest version of
+#      # cryptography we support cannot be compiled against the version of
+#      # OpenSSL in Xenial or newer.
+#      dist: trusty
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "2.7"
+#      env: ACME_SERVER=boulder-v1 TOXENV=integration-nginx-oldest
+#      # Ubuntu Trusty or older must be used because the oldest version of
+#      # cryptography we support cannot be compiled against the version of
+#      # OpenSSL in Xenial or newer.
+#      dist: trusty
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "2.7"
+#      env: ACME_SERVER=boulder-v2 TOXENV=integration-nginx-oldest
+#      # Ubuntu Trusty or older must be used because the oldest version of
+#      # cryptography we support cannot be compiled against the version of
+#      # OpenSSL in Xenial or newer.
+#      dist: trusty
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "3.6"
+#      env: TOXENV=py36
+#      <<: *extended-test-suite
+#    - python: "3.7"
+#      env: TOXENV=py37
+#      <<: *extended-test-suite
+#    - python: "3.5"
+#      env: ACME_SERVER=boulder-v1 TOXENV=integration
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "3.5"
+#      env: ACME_SERVER=boulder-v2 TOXENV=integration
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "3.6"
+#      env: ACME_SERVER=boulder-v1 TOXENV=integration
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "3.6"
+#      env: ACME_SERVER=boulder-v2 TOXENV=integration
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "3.7"
+#      env: ACME_SERVER=boulder-v1 TOXENV=integration
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "3.7"
+#      env: ACME_SERVER=boulder-v2 TOXENV=integration
+#      sudo: required
+#      services: docker
+#      <<: *extended-test-suite
+#    - python: "3.8"
+#      env: ACME_SERVER=boulder-v1 TOXENV=integration
+#      <<: *extended-test-suite
+#    - python: "3.8"
+#      env: ACME_SERVER=boulder-v2 TOXENV=integration
+#      <<: *extended-test-suite
+#    - sudo: required
+#      env: TOXENV=le_auto_jessie
+#      services: docker
+#      <<: *extended-test-suite
+#    - sudo: required
+#      env: TOXENV=le_auto_centos6
+#      services: docker
+#      <<: *extended-test-suite
+#    - sudo: required
+#      env: TOXENV=le_auto_oraclelinux6
+#      services: docker
+#      <<: *extended-test-suite
+#    - sudo: required
+#      env: TOXENV=docker_dev
+#      services: docker
+#      addons:
+#        apt:
+#          packages:  # don't install nginx and apache
+#            - libaugeas0
+#      <<: *extended-test-suite
     - stage: "Snap"
       env: SNAP=true TOXENV=integration-external,apacheconftest-external-with-pebble TARGET_ARCH=amd64
       <<: *snap-config