diff --git a/letsencrypt-auto-source/Dockerfile.redhat6 b/letsencrypt-auto-source/Dockerfile.redhat6
deleted file mode 100644
index 66f21bc140b..00000000000
--- a/letsencrypt-auto-source/Dockerfile.redhat6
+++ /dev/null
@@ -1,54 +0,0 @@
-# For running tests, build a docker image with a passwordless sudo and a trust
-# store we can manipulate.
-
-ARG REDHAT_DIST_FLAVOR
-FROM ${REDHAT_DIST_FLAVOR}:6
-
-ARG REDHAT_DIST_FLAVOR
-
-RUN curl -O https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm \
- && rpm -ivh epel-release-latest-6.noarch.rpm
-
-# Install pip and sudo:
-RUN yum install -y python-pip sudo
-# Update to a stable and tested version of pip.
-# We do not use pipstrap here because it no longer supports Python 2.6.
-RUN pip install pip==9.0.1 setuptools==29.0.1 wheel==0.29.0
-# Pin pytest version for increased stability
-RUN pip install pytest==3.2.5 six==1.10.0
-
-# Add an unprivileged user:
-RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups wheel --uid 1000 lea
-
-# Let that user sudo:
-RUN sed -i.bkp -e \
-      's/# %wheel\(NOPASSWD: ALL\)\?/%wheel/g' \
-      /etc/sudoers
-
-RUN mkdir -p /home/lea/certbot
-
-# Install fake testing CA:
-COPY ./tests/certs/ca/my-root-ca.crt.pem /usr/local/share/ca-certificates/
-RUN update-ca-trust
-
-# Copy current letsencrypt-auto:
-COPY . /home/lea/certbot/letsencrypt-auto-source
-
-# Tweak uname binary for tests on fake 32bits
-COPY tests/uname_wrapper.sh /bin
-RUN mv /bin/uname /bin/uname_orig \
- && mv /bin/uname_wrapper.sh /bin/uname \
- && chmod +x /bin/uname
-
-# Fetch previous letsencrypt-auto that was installing python 3.4
-RUN curl https://raw.githubusercontent.com/certbot/certbot/v0.38.0/letsencrypt-auto-source/letsencrypt-auto \
-    -o /home/lea/certbot/letsencrypt-auto-source/letsencrypt-auto_py_34 \
- && chmod +x /home/lea/certbot/letsencrypt-auto-source/letsencrypt-auto_py_34
-
-RUN cp /home/lea/certbot/letsencrypt-auto-source/tests/${REDHAT_DIST_FLAVOR}6_tests.sh /home/lea/certbot/letsencrypt-auto-source/tests/redhat6_tests.sh \
- && chmod +x /home/lea/certbot/letsencrypt-auto-source/tests/redhat6_tests.sh
-
-USER lea
-WORKDIR /home/lea
-
-CMD ["sudo", "certbot/letsencrypt-auto-source/tests/redhat6_tests.sh"]
diff --git a/letsencrypt-auto-source/tests/__init__.py b/letsencrypt-auto-source/tests/__init__.py
deleted file mode 100644
index 8a1613aa548..00000000000
--- a/letsencrypt-auto-source/tests/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""Tests for letsencrypt-auto
-
-Run these locally by saying... ::
-
-    ./build.py && docker build -t lea . -f Dockerfile.<distro> && docker run --rm -t -i lea
-
-"""
diff --git a/letsencrypt-auto-source/tests/auto_test.py b/letsencrypt-auto-source/tests/auto_test.py
deleted file mode 100644
index 805bb21af6b..00000000000
--- a/letsencrypt-auto-source/tests/auto_test.py
+++ /dev/null
@@ -1,503 +0,0 @@
-"""Tests for letsencrypt-auto"""
-
-from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-from contextlib import contextmanager
-from functools import partial
-from json import dumps
-from os import chmod, environ, makedirs, stat
-from os.path import abspath, dirname, exists, join
-import re
-from shutil import copy, rmtree
-import socket
-import ssl
-from stat import S_IMODE, S_IRUSR, S_IWUSR, S_IXUSR, S_IWGRP, S_IWOTH
-from subprocess import CalledProcessError, Popen, PIPE
-import sys
-from tempfile import mkdtemp
-from threading import Thread
-from unittest import TestCase
-
-from pytest import mark
-from six.moves import xrange  # pylint: disable=redefined-builtin
-
-
-@mark.skip
-def tests_dir():
-    """Return a path to the "tests" directory."""
-    return dirname(abspath(__file__))
-
-
-def copy_stable(src, dst):
-    """
-    Copy letsencrypt-auto, and replace its current version to its equivalent stable one.
-    This is needed to test correctly the self-upgrade functionality.
-    """
-    copy(src, dst)
-    with open(dst, 'r') as file:
-        filedata = file.read()
-    filedata = re.sub(r'LE_AUTO_VERSION="(.*)\.dev0"', r'LE_AUTO_VERSION="\1"', filedata)
-    with open(dst, 'w') as file:
-        file.write(filedata)
-
-
-sys.path.insert(0, dirname(tests_dir()))
-from build import build as build_le_auto
-
-
-BOOTSTRAP_FILENAME = 'certbot-auto-bootstrap-version.txt'
-"""Name of the file where certbot-auto saves its bootstrap version."""
-
-
-class RequestHandler(BaseHTTPRequestHandler):
-    """An HTTPS request handler which is quiet and serves a specific folder."""
-
-    def __init__(self, resources, *args, **kwargs):
-        """
-        :arg resources: A dict of resource paths pointing to content bytes
-
-        """
-        self.resources = resources
-        BaseHTTPRequestHandler.__init__(self, *args, **kwargs)
-
-    def log_message(self, format, *args):
-        """Don't log each request to the terminal."""
-
-    def do_GET(self):
-        """Serve a GET request."""
-        content = self.send_head()
-        if content is not None:
-            self.wfile.write(content)
-
-    def send_head(self):
-        """Common code for GET and HEAD commands
-
-        This sends the response code and MIME headers and returns either a
-        bytestring of content or, if none is found, None.
-
-        """
-        path = self.path[1:]  # Strip leading slash.
-        content = self.resources.get(path)
-        if content is None:
-            self.send_error(404, 'Path "%s" not found in self.resources' % path)
-        else:
-            self.send_response(200)
-            self.send_header('Content-type', 'text/plain')
-            self.send_header('Content-Length', str(len(content)))
-            self.end_headers()
-            return content
-
-
-def server_and_port(resources):
-    """Return an unstarted HTTPS server and the port it will use."""
-    # Find a port, and bind to it. I can't get the OS to close the socket
-    # promptly after we shut down the server, so we typically need to try
-    # a couple ports after the first test case. Setting
-    # TCPServer.allow_reuse_address = True seems to have nothing to do
-    # with this behavior.
-    worked = False
-    for port in xrange(4443, 4543):
-        try:
-            server = HTTPServer(('localhost', port),
-                                partial(RequestHandler, resources))
-        except socket.error:
-            pass
-        else:
-            worked = True
-            server.socket = ssl.wrap_socket(
-                server.socket,
-                certfile=join(tests_dir(), 'certs', 'localhost', 'server.pem'),
-                server_side=True)
-            break
-    if not worked:
-        raise RuntimeError("Couldn't find an unused socket for the testing HTTPS server.")
-    return server, port
-
-
-@contextmanager
-def serving(resources):
-    """Spin up a local HTTPS server, and yield its base URL.
-
-    Use a self-signed cert generated as outlined by
-    https://coolaj86.com/articles/create-your-own-certificate-authority-for-
-    testing/.
-
-    """
-    server, port = server_and_port(resources)
-    thread = Thread(target=server.serve_forever)
-    try:
-        thread.start()
-        yield 'https://localhost:{port}/'.format(port=port)
-    finally:
-        server.shutdown()
-        thread.join()
-
-
-LE_AUTO_PATH = join(dirname(tests_dir()), 'letsencrypt-auto')
-
-
-@contextmanager
-def temp_paths():
-    """Creates and deletes paths for letsencrypt-auto and its venv."""
-    dir = mkdtemp(prefix='le-test-')
-    try:
-        yield join(dir, 'letsencrypt-auto'), join(dir, 'venv')
-    finally:
-        rmtree(dir, ignore_errors=True)
-
-
-def out_and_err(command, input=None, shell=False, env=None):
-    """Run a shell command, and return stderr and stdout as string.
-
-    If the command returns nonzero, raise CalledProcessError.
-
-    :arg command: A list of commandline args
-    :arg input: Data to pipe to stdin. Omit for none.
-
-    Remaining args have the same meaning as for Popen.
-
-    """
-    process = Popen(command,
-                    stdout=PIPE,
-                    stdin=PIPE,
-                    stderr=PIPE,
-                    shell=shell,
-                    env=env)
-    out, err = process.communicate(input=input)
-    status = process.poll()  # same as in check_output(), though wait() sounds better
-    if status:
-        error = CalledProcessError(status, command)
-        error.output = out
-        print('stdout output was:')
-        print(out)
-        print('stderr output was:')
-        print(err)
-        raise error
-    return out, err
-
-
-def signed(content, private_key_name='signing.key'):
-    """Return the signed SHA-256 hash of ``content``, using the given key file."""
-    command = ['openssl', 'dgst', '-sha256', '-sign',
-               join(tests_dir(), private_key_name)]
-    out, err = out_and_err(command, input=content)
-    return out
-
-
-def install_le_auto(contents, install_path):
-    """Install some given source code as the letsencrypt-auto script at the
-    root level of a virtualenv.
-
-    :arg contents: The contents of the built letsencrypt-auto script
-    :arg install_path: The path where to install the script
-
-    """
-    with open(install_path, 'w') as le_auto:
-        le_auto.write(contents)
-    chmod(install_path, S_IRUSR | S_IXUSR)
-
-
-def run_le_auto(le_auto_path, venv_dir, base_url=None, le_auto_args_str='--version', **kwargs):
-    """Run the prebuilt version of letsencrypt-auto, returning stdout and
-    stderr strings.
-
-    If the command returns other than 0, raise CalledProcessError.
-
-    """
-    env = environ.copy()
-    d = dict(VENV_PATH=venv_dir,
-             NO_CERT_VERIFY='1',
-             **kwargs)
-
-    if base_url is not None:
-        # URL to PyPI-style JSON that tell us the latest released version
-        # of LE:
-        d['LE_AUTO_JSON_URL'] = base_url + 'certbot/json'
-        # URL to dir containing letsencrypt-auto and letsencrypt-auto.sig:
-        d['LE_AUTO_DIR_TEMPLATE'] = base_url + '%s/'
-        # The public key corresponding to signing.key:
-        d['LE_AUTO_PUBLIC_KEY'] = """-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMoSzLYQ7E1sdSOkwelg
-tzKIh2qi3bpXuYtcfFC0XrvWig071NwIj+dZiT0OLZ2hPispEH0B7ISuuWg1ll7G
-hFW0VdbxL6JdGzS2ShNWkX9hE9z+j8VqwDPOBn3ZHm03qwpYkBDwQib3KqOdYbTT
-uUtJmmGcuk3a9Aq/sCT6DdfmTSdP5asdQYwIcaQreDrOosaS84DTWI3IU+UYJVgl
-LsIVPBuy9IcgHidUQ96hJnoPsDCWsHwX62495QKEarauyKQrJzFes0EY95orDM47
-Z5o/NDiQB11m91yNB0MmPYY9QSbnOA9j7IaaC97AwRLuwXY+/R2ablTcxurWou68
-iQIDAQAB
------END PUBLIC KEY-----"""
-
-    env.update(d)
-
-    return out_and_err(
-        le_auto_path + ' ' + le_auto_args_str,
-        shell=True,
-        env=env)
-
-
-def set_le_script_version(venv_dir, version):
-    """Tell the letsencrypt script to report a certain version.
-
-    We actually replace the script with a dummy version that knows only how to
-    print its version.
-
-    """
-    letsencrypt_path = join(venv_dir, 'bin', 'letsencrypt')
-    with open(letsencrypt_path, 'w') as script:
-        script.write("#!/usr/bin/env python\n"
-                     "from sys import stderr\n"
-                     "stderr.write('letsencrypt %s\\n')" % version)
-    chmod(letsencrypt_path, S_IRUSR | S_IXUSR)
-
-
-def sudo_chmod(path, mode):
-    """Runs `sudo chmod mode path`."""
-    mode = oct(mode).replace('o', '')
-    out_and_err(['sudo', 'chmod', mode, path])
-
-
-class AutoTests(TestCase):
-    """Test the major branch points of letsencrypt-auto:
-
-    * An le-auto upgrade is needed.
-    * An le-auto upgrade is not needed.
-    * There was an out-of-date LE script installed.
-    * There was a current LE script installed.
-    * There was no LE script installed (less important).
-    * Pip hash-verification passes.
-    * Pip has a hash mismatch.
-    * The OpenSSL sig matches.
-    * The OpenSSL sig mismatches.
-
-    For tests which get to the end, we run merely ``letsencrypt --version``.
-    The functioning of the rest of the certbot script is covered by other
-    test suites.
-
-    """
-    NEW_LE_AUTO = build_le_auto(
-            version='99.9.9',
-            requirements='letsencrypt==99.9.9 --hash=sha256:1cc14d61ab424cdee446f51e50f1123f8482ec740587fe78626c933bba2873a0')
-    NEW_LE_AUTO_SIG = signed(NEW_LE_AUTO)
-
-    def test_successes(self):
-        """Exercise most branches of letsencrypt-auto.
-
-        They just happen to be the branches in which everything goes well.
-
-        I violate my usual rule of having small, decoupled tests, because...
-
-        1. We shouldn't need to run a Cartesian product of the branches: the
-           phases run in separate shell processes, containing state leakage
-           pretty effectively. The only shared state is FS state, and it's
-           limited to a temp dir, assuming (if we dare) all functions properly.
-        2. One combination of branches happens to set us up nicely for testing
-           the next, saving code.
-
-        """
-        with temp_paths() as (le_auto_path, venv_dir):
-            # This serves a PyPI page with a higher version, a GitHub-alike
-            # with a corresponding le-auto script, and a matching signature.
-            resources = {'certbot/json': dumps({'releases': {'99.9.9': None}}),
-                         'v99.9.9/letsencrypt-auto': self.NEW_LE_AUTO,
-                         'v99.9.9/letsencrypt-auto.sig': self.NEW_LE_AUTO_SIG}
-            with serving(resources) as base_url:
-                run_letsencrypt_auto = partial(
-                        run_le_auto,
-                        le_auto_path,
-                        venv_dir,
-                        base_url,
-                        PIP_FIND_LINKS=join(tests_dir(),
-                                            'fake-letsencrypt',
-                                            'dist'))
-
-                # Test when a phase-1 upgrade is needed, there's no LE binary
-                # installed, and pip hashes verify:
-                install_le_auto(build_le_auto(version='50.0.0'), le_auto_path)
-                out, err = run_letsencrypt_auto()
-                self.assertTrue(re.match(r'letsencrypt \d+\.\d+\.\d+',
-                                err.strip().splitlines()[-1]))
-                # Make a few assertions to test the validity of the next tests:
-                self.assertTrue('Upgrading certbot-auto ' in out)
-                self.assertTrue('Creating virtual environment...' in out)
-
-                # Now we have le-auto 99.9.9  and LE 99.9.9 installed. This
-                # conveniently sets us up to test the next 2 cases.
-
-                # Test when neither phase-1 upgrade nor phase-2 upgrade is
-                # needed (probably a common case):
-                out, err = run_letsencrypt_auto()
-                self.assertFalse('Upgrading certbot-auto ' in out)
-                self.assertFalse('Creating virtual environment...' in out)
-
-    def test_phase2_upgrade(self):
-        """Test a phase-2 upgrade without a phase-1 upgrade."""
-        resources = {'certbot/json': dumps({'releases': {'99.9.9': None}}),
-                     'v99.9.9/letsencrypt-auto': self.NEW_LE_AUTO,
-                     'v99.9.9/letsencrypt-auto.sig': self.NEW_LE_AUTO_SIG}
-        with serving(resources) as base_url:
-            pip_find_links=join(tests_dir(), 'fake-letsencrypt', 'dist')
-            with temp_paths() as (le_auto_path, venv_dir):
-                install_le_auto(self.NEW_LE_AUTO, le_auto_path)
-
-                # Create venv saving the correct bootstrap script version
-                out, err = run_le_auto(le_auto_path, venv_dir, base_url,
-                                       PIP_FIND_LINKS=pip_find_links)
-                self.assertFalse('Upgrading certbot-auto ' in out)
-                self.assertTrue('Creating virtual environment...' in out)
-                with open(join(venv_dir, BOOTSTRAP_FILENAME)) as f:
-                    bootstrap_version = f.read()
-
-            # Create a new venv with an old letsencrypt version
-            with temp_paths() as (le_auto_path, venv_dir):
-                venv_bin = join(venv_dir, 'bin')
-                makedirs(venv_bin)
-                set_le_script_version(venv_dir, '0.0.1')
-                with open(join(venv_dir, BOOTSTRAP_FILENAME), 'w') as f:
-                    f.write(bootstrap_version)
-
-                install_le_auto(self.NEW_LE_AUTO, le_auto_path)
-                out, err = run_le_auto(le_auto_path, venv_dir, base_url,
-                                       PIP_FIND_LINKS=pip_find_links)
-
-                self.assertFalse('Upgrading certbot-auto ' in out)
-                self.assertTrue('Creating virtual environment...' in out)
-
-    def test_openssl_failure(self):
-        """Make sure we stop if the openssl signature check fails."""
-        with temp_paths() as (le_auto_path, venv_dir):
-            # Serve an unrelated hash signed with the good key (easier than
-            # making a bad key, and a mismatch is a mismatch):
-            resources = {'': '<a href="certbot/">certbot/</a>',
-                         'certbot/json': dumps({'releases': {'99.9.9': None}}),
-                         'v99.9.9/letsencrypt-auto': build_le_auto(version='99.9.9'),
-                         'v99.9.9/letsencrypt-auto.sig': signed('something else')}
-            with serving(resources) as base_url:
-                copy_stable(LE_AUTO_PATH, le_auto_path)
-                try:
-                    out, err = run_le_auto(le_auto_path, venv_dir, base_url)
-                except CalledProcessError as exc:
-                    self.assertEqual(exc.returncode, 1)
-                    self.assertTrue("Couldn't verify signature of downloaded "
-                                    "certbot-auto." in exc.output)
-                else:
-                    print(out)
-                    self.fail('Signature check on certbot-auto erroneously passed.')
-
-    def test_pip_failure(self):
-        """Make sure pip stops us if there is a hash mismatch."""
-        with temp_paths() as (le_auto_path, venv_dir):
-            resources = {'': '<a href="certbot/">certbot/</a>',
-                         'certbot/json': dumps({'releases': {'99.9.9': None}})}
-            with serving(resources) as base_url:
-                # Build a le-auto script embedding a bad requirements file:
-                install_le_auto(
-                    build_le_auto(
-                        version='99.9.9',
-                        requirements='configobj==5.0.6 --hash=sha256:badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb'),
-                    le_auto_path)
-                try:
-                    out, err = run_le_auto(le_auto_path, venv_dir, base_url)
-                except CalledProcessError as exc:
-                    self.assertEqual(exc.returncode, 1)
-                    self.assertTrue("THESE PACKAGES DO NOT MATCH THE HASHES "
-                                    "FROM THE REQUIREMENTS FILE" in exc.output)
-                    self.assertFalse(
-                        exists(venv_dir),
-                        msg="The virtualenv was left around, even though "
-                            "installation didn't succeed. We shouldn't do "
-                            "this, as it foils our detection of whether we "
-                            "need to recreate the virtualenv, which hinges "
-                            "on the presence of $VENV_BIN/letsencrypt.")
-                else:
-                    self.fail("Pip didn't detect a bad hash and stop the "
-                              "installation.")
-
-    def test_permissions_warnings(self):
-        """Make sure letsencrypt-auto properly warns about permissions problems."""
-        # This test assumes that only the parent of the directory containing
-        # letsencrypt-auto (usually /tmp) may have permissions letsencrypt-auto
-        # considers insecure.
-        with temp_paths() as (le_auto_path, venv_dir):
-            le_auto_path = abspath(le_auto_path)
-            le_auto_dir = dirname(le_auto_path)
-            le_auto_dir_parent = dirname(le_auto_dir)
-            install_le_auto(self.NEW_LE_AUTO, le_auto_path)
-
-            run_letsencrypt_auto = partial(
-                run_le_auto, le_auto_path, venv_dir,
-                le_auto_args_str='--install-only --no-self-upgrade',
-                PIP_FIND_LINKS=join(tests_dir(), 'fake-letsencrypt', 'dist'))
-            # Run letsencrypt-auto once with current permissions to avoid
-            # potential problems when the script tries to write to temporary
-            # directories.
-            run_letsencrypt_auto()
-
-            le_auto_dir_mode = stat(le_auto_dir).st_mode
-            le_auto_dir_parent_mode = S_IMODE(stat(le_auto_dir_parent).st_mode)
-            try:
-                # Make letsencrypt-auto happy with the current permissions
-                chmod(le_auto_dir, S_IRUSR | S_IXUSR)
-                sudo_chmod(le_auto_dir_parent, 0o755)
-
-                self._test_permissions_warnings_about_path(le_auto_path, run_letsencrypt_auto)
-                self._test_permissions_warnings_about_path(le_auto_dir, run_letsencrypt_auto)
-            finally:
-                chmod(le_auto_dir, le_auto_dir_mode)
-                sudo_chmod(le_auto_dir_parent, le_auto_dir_parent_mode)
-
-    def _test_permissions_warnings_about_path(self, path, run_le_auto_func):
-        # Test that there are no problems with the current permissions
-        out, _ = run_le_auto_func()
-        self.assertFalse('insecure permissions' in out)
-
-        stat_result = stat(path)
-        original_mode = stat_result.st_mode
-
-        # Test world permissions
-        chmod(path, original_mode | S_IWOTH)
-        out, _ = run_le_auto_func()
-        self.assertTrue('insecure permissions' in out)
-
-        # Test group permissions
-        if stat_result.st_gid >= 1000:
-            chmod(path, original_mode | S_IWGRP)
-            out, _ = run_le_auto_func()
-            self.assertTrue('insecure permissions' in out)
-
-        # Test owner permissions
-        if stat_result.st_uid >= 1000:
-            chmod(path, original_mode | S_IWUSR)
-            out, _ = run_le_auto_func()
-            self.assertTrue('insecure permissions' in out)
-
-        # Test that permissions were properly restored
-        chmod(path, original_mode)
-        out, _ = run_le_auto_func()
-        self.assertFalse('insecure permissions' in out)
-
-    def test_disabled_permissions_warnings(self):
-        """Make sure that letsencrypt-auto permissions warnings can be disabled."""
-        with temp_paths() as (le_auto_path, venv_dir):
-            le_auto_path = abspath(le_auto_path)
-            install_le_auto(self.NEW_LE_AUTO, le_auto_path)
-
-            le_auto_args_str='--install-only --no-self-upgrade'
-            pip_links=join(tests_dir(), 'fake-letsencrypt', 'dist')
-            out, _ = run_le_auto(le_auto_path, venv_dir,
-                                 le_auto_args_str=le_auto_args_str,
-                                 PIP_FIND_LINKS=pip_links)
-            self.assertTrue('insecure permissions' in out)
-
-            # Test that warnings are disabled when the script isn't run as
-            # root.
-            out, _ = run_le_auto(le_auto_path, venv_dir,
-                                 le_auto_args_str=le_auto_args_str,
-                                 LE_AUTO_SUDO='',
-                                 PIP_FIND_LINKS=pip_links)
-            self.assertFalse('insecure permissions' in out)
-
-            # Test that --no-permissions-check disables warnings.
-            le_auto_args_str += ' --no-permissions-check'
-            out, _ = run_le_auto(
-                le_auto_path, venv_dir,
-                le_auto_args_str=le_auto_args_str,
-                PIP_FIND_LINKS=pip_links)
-            self.assertFalse('insecure permissions' in out)
diff --git a/letsencrypt-auto-source/tests/centos6_tests.sh b/letsencrypt-auto-source/tests/centos6_tests.sh
deleted file mode 100644
index 8bdffec87f7..00000000000
--- a/letsencrypt-auto-source/tests/centos6_tests.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-set -e
-# Start by making sure your system is up-to-date:
-yum update -y >/dev/null
-yum install -y centos-release-scl >/dev/null
-yum install -y python27 >/dev/null 2>/dev/null
-
-LE_AUTO_PY_34="certbot/letsencrypt-auto-source/letsencrypt-auto_py_34"
-LE_AUTO="certbot/letsencrypt-auto-source/letsencrypt-auto"
-
-# Last version of certbot-auto that was bootstraping Python 3.4 for CentOS 6 users
-INITIAL_CERTBOT_VERSION_PY34="certbot 0.38.0"
-
-# we're going to modify env variables, so do this in a subshell
-(
-# ensure CentOS6 32bits is not supported anymore, and so certbot is not installed
-export UNAME_FAKE_32BITS=true
-if ! "$LE_AUTO" 2>&1 | grep -q "Certbot cannot be installed."; then
-  echo "ERROR: certbot-auto installed certbot on 32-bit CentOS."
-  exit 1
-fi
-)
-
-echo "PASSED: On CentOS 6 32 bits, certbot-auto refused to install certbot."
-
-# we're going to modify env variables, so do this in a subshell
-(
-  . /opt/rh/python27/enable
-
-  # ensure python 3 isn't installed
-  if python3 --version 2> /dev/null; then
-    echo "ERROR: Python3 is already installed."
-    exit 1
-  fi
-
-  # ensure python2.7 is available
-  if ! python2.7 --version 2> /dev/null; then
-    echo "ERROR: Python2.7 is not available."
-    exit 1
-  fi
-
-  # bootstrap, but don't install python 3.
-  "$LE_AUTO" --no-self-upgrade -n --version > /dev/null 2> /dev/null
-
-  # ensure python 3 isn't installed
-  if python3 --version 2> /dev/null; then
-    echo "ERROR: letsencrypt-auto installed Python3 even though Python2.7 is present."
-    exit 1
-  fi
-
-  echo "PASSED: Did not upgrade to Python3 when Python2.7 is present."
-)
-
-# ensure python2.7 isn't available
-if python2.7 --version 2> /dev/null; then
-  echo "ERROR: Python2.7 is still available."
-  exit 1
-fi
-
-# Skip self upgrade due to Python 3 not being available.
-if ! "$LE_AUTO" 2>&1 | grep -q "WARNING: couldn't find Python"; then
-  echo "ERROR: Python upgrade failure warning not printed!"
-  exit 1
-fi
-
-# bootstrap from the old letsencrypt-auto, this time installing python3.4
-"$LE_AUTO_PY_34" --no-self-upgrade -n --version >/dev/null 2>/dev/null
-
-# ensure python 3.4 is installed
-if ! python3.4 --version >/dev/null 2>/dev/null; then
-  echo "ERROR: letsencrypt-auto failed to install Python3.4 using letsencrypt-auto < 0.37.0 when only Python2.6 is present."
-  exit 1
-fi
-
-echo "PASSED: Successfully upgraded to Python3.4 using letsencrypt-auto < 0.37.0 when only Python2.6 is present."
-
-# As "certbot-auto" (so without implicit --non-interactive flag set), check that the script
-# refuses to install SCL Python 3.6 when run in a non interactive shell (simulated here
-# using | tee /dev/null) if --non-interactive flag is not provided.
-cp "$LE_AUTO" /tmp/certbot-auto
-# NB: Readline has an issue on all Python versions for CentOS 6, making `certbot --version`
-# output an unprintable ASCII character on a new line at the end.
-# So we take the second last line of the output.
-version=$(/tmp/certbot-auto --version 2>/dev/null | tee /dev/null | tail -2 | head -1)
-
-if [ "$version" != "$INITIAL_CERTBOT_VERSION_PY34" ]; then
-  echo "ERROR: certbot-auto upgraded certbot in a non-interactive shell with --non-interactive flag not set."
-  exit 1
-fi
-
-echo "PASSED: certbot-auto did not upgrade certbot in a non-interactive shell with --non-interactive flag not set."
-
-if [ -f /opt/rh/rh-python36/enable ]; then
-  echo "ERROR: certbot-auto installed Python3.6 in a non-interactive shell with --non-interactive flag not set."
-  exit 1
-fi
-
-echo "PASSED: certbot-auto did not install Python3.6 in a non-interactive shell with --non-interactive flag not set."
-
-# now bootstrap from current letsencrypt-auto, that will install python3.6 from SCL
-"$LE_AUTO" --no-self-upgrade -n --version >/dev/null 2>/dev/null
-
-# Following test is executed in a subshell, to not leak any environment variable
-(
-  # enable SCL rh-python36
-  . /opt/rh/rh-python36/enable
-
-  # ensure python 3.6 is installed
-  if ! python3.6 --version >/dev/null 2>/dev/null; then
-    echo "ERROR: letsencrypt-auto failed to install Python3.6 using current letsencrypt-auto when only Python2.6/Python3.4 are present."
-    exit 1
-  fi
-
-  echo "PASSED: Successfully upgraded to Python3.6 using current letsencrypt-auto when only Python2.6/Python3.4 are present."
-)
-
-# Following test is executed in a subshell, to not leak any environment variable
-(
-  export VENV_PATH=$(mktemp -d)
-  "$LE_AUTO" -n --no-bootstrap --no-self-upgrade --version >/dev/null 2>&1
-  if [ "$($VENV_PATH/bin/python -V 2>&1 | cut -d" " -f2 | cut -d. -f1-2)" != "3.6" ]; then
-    echo "ERROR: Python 3.6 wasn't used with --no-bootstrap!"
-    exit 1
-  fi
-)
-
-# Following test is executed in a subshell, to not leak any environment variable
-(
-  # enable SCL rh-python36
-  . /opt/rh/rh-python36/enable
-
-  # ensure everything works fine with certbot-auto bootstrap when python 3.6 is already enabled
-  export VENV_PATH=$(mktemp -d)
-  if ! "$LE_AUTO" --no-self-upgrade -n --version >/dev/null 2>/dev/null; then
-    echo "ERROR: Certbot-auto broke when Python 3.6 SCL is already enabled."
-    exit 1
-  fi
-)
-
-# we're going to modify env variables, so do this in a subshell
-(
-  # ensure CentOS6 32bits is not supported anymore, and so certbot
-  # is not upgraded nor reinstalled.
-  export UNAME_FAKE_32BITS=true
-  OUTPUT=$("$LE_AUTO" --version 2>&1)
-  if ! echo "$OUTPUT" | grep -q "Certbot will no longer receive updates."; then
-    echo "ERROR: certbot-auto failed to run or upgraded pre-existing Certbot instance on 32-bit CentOS 6."
-    exit 1
-  fi
-  if ! "$LE_AUTO" --install-only 2>&1 | grep -q "Certbot cannot be installed."; then
-    echo "ERROR: certbot-auto reinstalled Certbot on 32-bit CentOS 6."
-    exit 1
-  fi
-)
-
-# we're going to modify env variables, so do this in a subshell
-(
-  # Prepare a certbot installation in the old venv path
-  rm -rf /opt/eff.org
-  VENV_PATH=~/.local/share/letsencrypt "$LE_AUTO" --install-only > /dev/null 2> /dev/null
-  # fake 32 bits mode
-  export UNAME_FAKE_32BITS=true
-  OUTPUT=$("$LE_AUTO" --version 2>&1)
-  if ! echo "$OUTPUT" | grep -q "Certbot will no longer receive updates."; then
-    echo "ERROR: certbot-auto failed to run or upgraded pre-existing Certbot instance in the old venv path on 32-bit CentOS 6."
-    exit 1
-  fi
-)
-
-echo "PASSED: certbot-auto refused to install/upgrade certbot on 32-bit CentOS 6."
-
-# test using python3
-pytest -v -s certbot/letsencrypt-auto-source/tests
diff --git a/letsencrypt-auto-source/tests/certs/ca/my-root-ca.crt.pem b/letsencrypt-auto-source/tests/certs/ca/my-root-ca.crt.pem
deleted file mode 100644
index 4e4d29bd225..00000000000
--- a/letsencrypt-auto-source/tests/certs/ca/my-root-ca.crt.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIJAI1Qkfyw88REMA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMRswGQYDVQQKExJNeSBCb2d1cyBS
-b290IENlcnQxFDASBgNVBAMTC2V4YW1wbGUuY29tMB4XDTE1MTIwNDIwNTIxNVoX
-DTQwMTIwMzIwNTIxNVowVTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3Rh
-dGUxGzAZBgNVBAoTEk15IEJvZ3VzIFJvb3QgQ2VydDEUMBIGA1UEAxMLZXhhbXBs
-ZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQVQpQ2EH4gTJB
-NJP6+ocT3xJwT8mSXYUnvzjj6iv+JxZiXRGzAPziNzrrSRKY0yDHF+UiJwuOerLa
-n8laZkLb1Ogqzs2u64rKeb0xWv90Qp+eXG0J/1xb4dw+GExqe5QFo1JUJzO/eK7m
-1S04SeFkN1qV9mD5yJUy7DGiTUzDHgCxM2tXMLusXYqkxsQQ9+2EJ7BEOK4YJGEx
-Sign5FuSxb64PiNow6OA97CaLl7tV4INP4w195ueDRIaS4poeOep4s8U7IAdMjIZ
-EryJgKNCij50xK92vPBBJSj0NOitltBlwoEqkOZpQCOZamFd6nvt78LQ6W8Am+l6
-y6oCON5JAgMBAAGjgbgwgbUwHQYDVR0OBBYEFAlrdStDhaayLLj89Whe3Gc+HE8y
-MIGFBgNVHSMEfjB8gBQJa3UrQ4Wmsiy4/PVoXtxnPhxPMqFZpFcwVTELMAkGA1UE
-BhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxGzAZBgNVBAoTEk15IEJvZ3VzIFJv
-b3QgQ2VydDEUMBIGA1UEAxMLZXhhbXBsZS5jb22CCQCNUJH8sPPERDAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQC7KAQfDTiNM3QO8Ic3x21CAPJUavkH
-zshifN+Ei0+nmseHDTCTgsGfGDOToLUpUEZ4PuiHnz08UwRfd9wotc3SgY9ZaXMe
-vRs8KUAF9EoyTvESzPyv2b6cS9NNMpj5y7KyXSyP17VoGbNavtiGQ4dwgEH6VgNl
-0RtBvcSBv/tqxIIx1tWzL74tVEm0Kbd9BAZsYpQNKL8e6WXP35/j0PvCCvtofGrA
-E8LTqMz4kCwnX+QaJIMJhBophRCsjXdAkvFbFxX0DGPztQtzIwBPcdMjsft7AFeE
-0XchhDDXxw8YsbpvPfCvrD8XiiVuBycbnB1zt0LLVwB/QsCzUW9ImpLC
------END CERTIFICATE-----
diff --git a/letsencrypt-auto-source/tests/certs/ca/my-root-ca.key.pem b/letsencrypt-auto-source/tests/certs/ca/my-root-ca.key.pem
deleted file mode 100644
index 9caa7ddaad6..00000000000
--- a/letsencrypt-auto-source/tests/certs/ca/my-root-ca.key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA0FUKUNhB+IEyQTST+vqHE98ScE/Jkl2FJ7844+or/icWYl0R
-swD84jc660kSmNMgxxflIicLjnqy2p/JWmZC29ToKs7NruuKynm9MVr/dEKfnlxt
-Cf9cW+HcPhhManuUBaNSVCczv3iu5tUtOEnhZDdalfZg+ciVMuwxok1Mwx4AsTNr
-VzC7rF2KpMbEEPfthCewRDiuGCRhMUooJ+RbksW+uD4jaMOjgPewmi5e7VeCDT+M
-Nfebng0SGkuKaHjnqeLPFOyAHTIyGRK8iYCjQoo+dMSvdrzwQSUo9DTorZbQZcKB
-KpDmaUAjmWphXep77e/C0OlvAJvpesuqAjjeSQIDAQABAoIBAH+qbVzneV3wxjwh
-HUHi/p3VyHXc3xh7iNq3mwRH/1eK2nPCttLsGwwBbnC64dOXJfH7maWZKcLRPAMv
-gfOM0RHn4bJB8tdrbizv91lke0DihvBDkWpb+1wvB4lh2Io0Wpwt3ojFUTfXm87G
-+iQRWjbQmQlm5zyKh6uiBDSCjDTQdb9omZEBMAwlGPTZwt8TRUEtWd8QgW8FCHoB
-iLER2WBwXdvn3PBtocI3VE6IYDSeZ81Xv+d7925RtVintT8Suk4toYwX+jfSz+wZ
-sgHd5V6PSv9a7GUlWoUihD99D9wqDZE8IvMDZ5ofSAUd1KfICDtmsEyugY7u2yYZ
-tYt49AECgYEA73f7ITMHg8JsUipqb6eG10gCRtRhkqrrO1g/TNeTBh3CTrQGb56e
-y6kmUivn5gK46t3T2N4Ht4IR8fpLcJcbPYPQNulSjmWm5y6WduafXW/VCW1NA9Lc
-FyGPkMxFCIVJTLFxfLFepBVvtUzLLDKGGtQxru/GNbBzjdtmVfDPIoECgYEA3rbM
-cTfvj+jWrV1YsRbphyjy+k3OJEIVx6KA4s5d7Tp12UfYQp/B3HPhXXm5wqeo1Nos
-UAEWZIMi1VoE8iu6jjeJ6uERtbKKQVed25Us/ff0jUPbxlXgiBOtRcllq9d9Srjm
-ybHUgfjLsZ2/xpIcOl+oI5pDM9JvD8Sq4ZCFR8kCgYBK/H0tFjeiML2OtS2DLShy
-PWBJIbQ0I0Vp3eZkf5TQc30m/ASP61G6YItZa9pAElYpZbEy1cQA2MAZz9DTvt2O
-07ndmA57/KTY+6OuM+Vvctd5DjrxmZPFwoKcSvrLAkHDvETXUQtbwkKquRNeEawg
-tpWgPAELSufEYhGXk8KpAQKBgBDCqPgMQZcO6rj5QWdyVfi5+C8mE9Fet8ziSdjH
-twHXWG8VnQzGgQxaHCewtW4Ut/vsv1D2A/1kcQalU6H18IArZdGrRm3qFcV9FoAj
-5dLnChxncu6mH9Odx3htA52/BcrNx3B+VYPCeXHQcVI8RKuP71NelJgdygXhwwpe
-mekhAoGBAOUovnqylciYa9HRqo+xZk59eyX+ehhnlV8SeJ2K0PwaQkzQ0KYtCmE7
-kdSdhcv8h/IQKGaFfc/LyFMM/a26PfAeY5bj41UjkT0K5hQrYuL/52xaT401YLcb
-Xo+bZz9K0hrdP7TdZFuTY/WxojXgjsVAuAN1NwnJumqxhzPh+hfl
------END RSA PRIVATE KEY-----
diff --git a/letsencrypt-auto-source/tests/certs/ca/my-root-ca.srl b/letsencrypt-auto-source/tests/certs/ca/my-root-ca.srl
deleted file mode 100644
index ad6d262b459..00000000000
--- a/letsencrypt-auto-source/tests/certs/ca/my-root-ca.srl
+++ /dev/null
@@ -1 +0,0 @@
-D613482D0EF95DD0
diff --git a/letsencrypt-auto-source/tests/certs/localhost/cert.pem b/letsencrypt-auto-source/tests/certs/localhost/cert.pem
deleted file mode 100644
index ac83535ced6..00000000000
--- a/letsencrypt-auto-source/tests/certs/localhost/cert.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDKjCCAhICCQDWE0gtDvld0DANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEbMBkGA1UEChMSTXkgQm9ndXMgUm9vdCBD
-ZXJ0MRQwEgYDVQQDEwtleGFtcGxlLmNvbTAeFw0xNTEyMDQyMDU0MzFaFw00MDEy
-MDMyMDU0MzFaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEw
-HwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxvY2Fs
-aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2WIIi86Mis4UQH
-a5PrFbX2PBtQHbI3t3ekN1CewRsgQ/2X3lCeWhKmr3CJYXVgA7q/23PORQAiuV6y
-DG2dQIrjeahWCXaCptTi49ljfVRTW2IxrHke/iA8TkDuZbWGzVLb8TB83ipBOD41
-SjuomoN4A/ktnIfbNqRqgjjHs2wwJHDfxPiCQlwyOayjHmdlh8cqfVE8rWEm5/3T
-Iu0X1J53SammR1SbUmsLJNofxFYMK1ogHb0CaFEG9QuuUDPJl5K74Rr6InMQZKPn
-ne4W3cGoALxPHAca7yicpSMSmdsmd6pqylc2Fdua7o/wf0SwShxS4A1DqA/HWLEM
-V6MSEF8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAz5sMAFG6W/ZEULZITkBTCU6P
-NttpGiKufnqyBW5HyNylaczfnHnClvQjr8f/84xvKVcfC3xP0lz+92aIQqo+5L/n
-v7gLhBFR4Vr2XwMt2qz2FpkaxmVwnhVAHaaC05WIKQ6W2gDwWT0u1K8YdTh+7mvN
-AT9FW4vDgtNZWq4W/PePh9QCiOOQhGOuBYj/7zqLtz4XPifhi66ILIRDHiu0kond
-3YMFcECIAf4MPT9vT0iNcWX+c8CfAixPt8nMD6bzOo3oTcfuZh/2enfgLbMqOlOi
-uk72FM5VVPXTWAckJvL/vVjqsvDuJQKqbr0oUc3bdWbS36xtWZUycp4IQLguAQ==
------END CERTIFICATE-----
diff --git a/letsencrypt-auto-source/tests/certs/localhost/localhost.csr.pem b/letsencrypt-auto-source/tests/certs/localhost/localhost.csr.pem
deleted file mode 100644
index 8a6189f8841..00000000000
--- a/letsencrypt-auto-source/tests/certs/localhost/localhost.csr.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICnjCCAYYCAQAwWTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
-ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAxMJbG9j
-YWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArZYgiLzoyKzh
-RAdrk+sVtfY8G1Adsje3d6Q3UJ7BGyBD/ZfeUJ5aEqavcIlhdWADur/bc85FACK5
-XrIMbZ1AiuN5qFYJdoKm1OLj2WN9VFNbYjGseR7+IDxOQO5ltYbNUtvxMHzeKkE4
-PjVKO6iag3gD+S2ch9s2pGqCOMezbDAkcN/E+IJCXDI5rKMeZ2WHxyp9UTytYSbn
-/dMi7RfUnndJqaZHVJtSawsk2h/EVgwrWiAdvQJoUQb1C65QM8mXkrvhGvoicxBk
-o+ed7hbdwagAvE8cBxrvKJylIxKZ2yZ3qmrKVzYV25ruj/B/RLBKHFLgDUOoD8dY
-sQxXoxIQXwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAFbg3WrAokoPx7iAYG6z
-PqeDd4/XanXjeL4Ryxv6LoGhu69mmBAd3N5ILPyQJjnkWpIjEmJDzEcPMzhQjRh5
-GlWTyvKWO4zClYU840KZk7crVkpzNZ+HP0YeM/Agz6sab00ffRcq5m1wEF9MCvDE
-8FUXk1HBHRAb/6t9QV/7axsPOkGT8SjQ1v2SCaiB0HQL3sYChYLi5zu4dfmQNPGq
-ar9Xm5a0YqOQIFfmy8RSwxk0Q/ipNFTGN1uvlIRkgbT9zPnodxjWZsSI9BF+q5Af
-uiE/oAk7MxfJ0LyLfhOWB+T98bKIOVtFT3wMLS1IIgMogwqCEXFf30Q9p2iTEzqT
-6UE=
------END CERTIFICATE REQUEST-----
diff --git a/letsencrypt-auto-source/tests/certs/localhost/privkey.pem b/letsencrypt-auto-source/tests/certs/localhost/privkey.pem
deleted file mode 100644
index 18feba40363..00000000000
--- a/letsencrypt-auto-source/tests/certs/localhost/privkey.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEArZYgiLzoyKzhRAdrk+sVtfY8G1Adsje3d6Q3UJ7BGyBD/Zfe
-UJ5aEqavcIlhdWADur/bc85FACK5XrIMbZ1AiuN5qFYJdoKm1OLj2WN9VFNbYjGs
-eR7+IDxOQO5ltYbNUtvxMHzeKkE4PjVKO6iag3gD+S2ch9s2pGqCOMezbDAkcN/E
-+IJCXDI5rKMeZ2WHxyp9UTytYSbn/dMi7RfUnndJqaZHVJtSawsk2h/EVgwrWiAd
-vQJoUQb1C65QM8mXkrvhGvoicxBko+ed7hbdwagAvE8cBxrvKJylIxKZ2yZ3qmrK
-VzYV25ruj/B/RLBKHFLgDUOoD8dYsQxXoxIQXwIDAQABAoIBAG8bVJ+xKt6nqVg9
-16HKKw9ZGIfy888K0qgFuFImCzwtntdGycmYUdb2Uf0aMgNK/ZgfDXxGXuwDTdtK
-46GVsaY0i74vs8bjQZ2pzGVsxN+gqzFi0h6Es+w2LXBqJzfVnL6YgPykMB+jtzg6
-K9Wbyaq0uvZXN4XNzl/WvJtTV4i7Cff1MOd5EhKFdqxrZvB/SRBCr/SMMafRtB9P
-EvMneNKzhmlrutHAxuyxEKZR32Kkx7ydAdTjGgn+rE+NL5BweXfeWhLU4Bv14bn9
-Mkneu3w5o1ryJfE2YnVajUP//jeopUT0nTQ3MpEusBQCLBlvFXjjM9uCaFX+5+MP
-0H4xVcECgYEA1Q+wR3GHbk37vIGSlbENyUsri5WlMt8IVAHsDsTOpxAjYB0yyo+x
-h9RS+RJZQECJlA6H72peUl3GM7RgdWIcKOT3nZ12XqYKG57rr/N5zlUuxbdS8KBk
-JhyZeJdYjq/Jrno1ZP+OSmc7VvBLcM7irY7LHlvK0o8W1W0TNJ8jrZkCgYEA0JHX
-lJd+fiezcUS7g4moHtzJp0JKquQiXLX+c2urmpyhb3ZrTuQ8OUjSy6DlwHlgDx8K
-Hg2sdx/ZCuDaGjR4IY/Qs5RFt9WUqlK9gi9V3nYVrzBOQkdFOf/Ad3j4pQ8/aeCX
-nP6snHXz1WqPpbCXG6l6GzFGbQU473GfuKsDuLcCgYAWQaNKc0OQdDj9whNL68ji
-5CVSWXl+TOoTzHeaO1jS/s6TNbmei1AiPj3EovQL0DIO802j5tqfhAg2UntZB7yl
-UPXE0zQQQwv/QqSgJrDsqt1N7g6N8FNF3+rwO+8WSKqqvT1ipYd5ojsCo+tdh18K
-fkYdj70qLaRW+yPsdUtG0QKBgEYc8NqbvsML94+ZKmwCh4iwcf2PFGi0PjTqXTpR
-tKNKCh7dMR+ZLAGZ0HrxgKqeYsNSjOUjdZmqFB1LDyaGAuhNXzwvGOy+mLZVEC3G
-Wdhp28pDs9sl+EiSCBJhkTxzjr656F23YzFJmYlhxB5P6cw7wbeIbgNSIRylFqtO
-mfarAoGBAICsAEWypOctxtmtOcjxgJ7jMbOA7rrsGlXpiy1/WlwIwRGF5LMvIIFX
-qFAfiPcZn05ZgdAGzaFYowdjmQB10FW0jZbDf+nIHfOF5YmfmfWjsaweEGALJmqB
-okGu/lGNGf3XoYzy0/hC3WAqk3znSZtQLUq8jEWF7dLNUizUeUow
------END RSA PRIVATE KEY-----
diff --git a/letsencrypt-auto-source/tests/certs/localhost/server.pem b/letsencrypt-auto-source/tests/certs/localhost/server.pem
deleted file mode 100644
index c5765dd890d..00000000000
--- a/letsencrypt-auto-source/tests/certs/localhost/server.pem
+++ /dev/null
@@ -1,46 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEArZYgiLzoyKzhRAdrk+sVtfY8G1Adsje3d6Q3UJ7BGyBD/Zfe
-UJ5aEqavcIlhdWADur/bc85FACK5XrIMbZ1AiuN5qFYJdoKm1OLj2WN9VFNbYjGs
-eR7+IDxOQO5ltYbNUtvxMHzeKkE4PjVKO6iag3gD+S2ch9s2pGqCOMezbDAkcN/E
-+IJCXDI5rKMeZ2WHxyp9UTytYSbn/dMi7RfUnndJqaZHVJtSawsk2h/EVgwrWiAd
-vQJoUQb1C65QM8mXkrvhGvoicxBko+ed7hbdwagAvE8cBxrvKJylIxKZ2yZ3qmrK
-VzYV25ruj/B/RLBKHFLgDUOoD8dYsQxXoxIQXwIDAQABAoIBAG8bVJ+xKt6nqVg9
-16HKKw9ZGIfy888K0qgFuFImCzwtntdGycmYUdb2Uf0aMgNK/ZgfDXxGXuwDTdtK
-46GVsaY0i74vs8bjQZ2pzGVsxN+gqzFi0h6Es+w2LXBqJzfVnL6YgPykMB+jtzg6
-K9Wbyaq0uvZXN4XNzl/WvJtTV4i7Cff1MOd5EhKFdqxrZvB/SRBCr/SMMafRtB9P
-EvMneNKzhmlrutHAxuyxEKZR32Kkx7ydAdTjGgn+rE+NL5BweXfeWhLU4Bv14bn9
-Mkneu3w5o1ryJfE2YnVajUP//jeopUT0nTQ3MpEusBQCLBlvFXjjM9uCaFX+5+MP
-0H4xVcECgYEA1Q+wR3GHbk37vIGSlbENyUsri5WlMt8IVAHsDsTOpxAjYB0yyo+x
-h9RS+RJZQECJlA6H72peUl3GM7RgdWIcKOT3nZ12XqYKG57rr/N5zlUuxbdS8KBk
-JhyZeJdYjq/Jrno1ZP+OSmc7VvBLcM7irY7LHlvK0o8W1W0TNJ8jrZkCgYEA0JHX
-lJd+fiezcUS7g4moHtzJp0JKquQiXLX+c2urmpyhb3ZrTuQ8OUjSy6DlwHlgDx8K
-Hg2sdx/ZCuDaGjR4IY/Qs5RFt9WUqlK9gi9V3nYVrzBOQkdFOf/Ad3j4pQ8/aeCX
-nP6snHXz1WqPpbCXG6l6GzFGbQU473GfuKsDuLcCgYAWQaNKc0OQdDj9whNL68ji
-5CVSWXl+TOoTzHeaO1jS/s6TNbmei1AiPj3EovQL0DIO802j5tqfhAg2UntZB7yl
-UPXE0zQQQwv/QqSgJrDsqt1N7g6N8FNF3+rwO+8WSKqqvT1ipYd5ojsCo+tdh18K
-fkYdj70qLaRW+yPsdUtG0QKBgEYc8NqbvsML94+ZKmwCh4iwcf2PFGi0PjTqXTpR
-tKNKCh7dMR+ZLAGZ0HrxgKqeYsNSjOUjdZmqFB1LDyaGAuhNXzwvGOy+mLZVEC3G
-Wdhp28pDs9sl+EiSCBJhkTxzjr656F23YzFJmYlhxB5P6cw7wbeIbgNSIRylFqtO
-mfarAoGBAICsAEWypOctxtmtOcjxgJ7jMbOA7rrsGlXpiy1/WlwIwRGF5LMvIIFX
-qFAfiPcZn05ZgdAGzaFYowdjmQB10FW0jZbDf+nIHfOF5YmfmfWjsaweEGALJmqB
-okGu/lGNGf3XoYzy0/hC3WAqk3znSZtQLUq8jEWF7dLNUizUeUow
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDKjCCAhICCQDWE0gtDvld0DANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEbMBkGA1UEChMSTXkgQm9ndXMgUm9vdCBD
-ZXJ0MRQwEgYDVQQDEwtleGFtcGxlLmNvbTAeFw0xNTEyMDQyMDU0MzFaFw00MDEy
-MDMyMDU0MzFaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEw
-HwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxvY2Fs
-aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2WIIi86Mis4UQH
-a5PrFbX2PBtQHbI3t3ekN1CewRsgQ/2X3lCeWhKmr3CJYXVgA7q/23PORQAiuV6y
-DG2dQIrjeahWCXaCptTi49ljfVRTW2IxrHke/iA8TkDuZbWGzVLb8TB83ipBOD41
-SjuomoN4A/ktnIfbNqRqgjjHs2wwJHDfxPiCQlwyOayjHmdlh8cqfVE8rWEm5/3T
-Iu0X1J53SammR1SbUmsLJNofxFYMK1ogHb0CaFEG9QuuUDPJl5K74Rr6InMQZKPn
-ne4W3cGoALxPHAca7yicpSMSmdsmd6pqylc2Fdua7o/wf0SwShxS4A1DqA/HWLEM
-V6MSEF8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAz5sMAFG6W/ZEULZITkBTCU6P
-NttpGiKufnqyBW5HyNylaczfnHnClvQjr8f/84xvKVcfC3xP0lz+92aIQqo+5L/n
-v7gLhBFR4Vr2XwMt2qz2FpkaxmVwnhVAHaaC05WIKQ6W2gDwWT0u1K8YdTh+7mvN
-AT9FW4vDgtNZWq4W/PePh9QCiOOQhGOuBYj/7zqLtz4XPifhi66ILIRDHiu0kond
-3YMFcECIAf4MPT9vT0iNcWX+c8CfAixPt8nMD6bzOo3oTcfuZh/2enfgLbMqOlOi
-uk72FM5VVPXTWAckJvL/vVjqsvDuJQKqbr0oUc3bdWbS36xtWZUycp4IQLguAQ==
------END CERTIFICATE-----
diff --git a/letsencrypt-auto-source/tests/fake-letsencrypt/dist/letsencrypt-99.9.9.tar.gz b/letsencrypt-auto-source/tests/fake-letsencrypt/dist/letsencrypt-99.9.9.tar.gz
deleted file mode 100644
index 5f9a48a34a2..00000000000
Binary files a/letsencrypt-auto-source/tests/fake-letsencrypt/dist/letsencrypt-99.9.9.tar.gz and /dev/null differ
diff --git a/letsencrypt-auto-source/tests/fake-letsencrypt/letsencrypt.py b/letsencrypt-auto-source/tests/fake-letsencrypt/letsencrypt.py
deleted file mode 100755
index 9d811fab527..00000000000
--- a/letsencrypt-auto-source/tests/fake-letsencrypt/letsencrypt.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from sys import argv, stderr
-
-
-def main():
-    """Act like letsencrypt --version insofar as printing the version number to
-    stderr."""
-    if '--version' in argv:
-        stderr.write('letsencrypt 99.9.9\n')
diff --git a/letsencrypt-auto-source/tests/fake-letsencrypt/setup.py b/letsencrypt-auto-source/tests/fake-letsencrypt/setup.py
deleted file mode 100644
index e5f7fde350e..00000000000
--- a/letsencrypt-auto-source/tests/fake-letsencrypt/setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from setuptools import setup
-
-
-setup(
-    name='letsencrypt',
-    version='99.9.9',
-    description='A mock version of letsencrypt that just prints its version',
-    py_modules=['letsencrypt'],
-    entry_points={
-        'console_scripts': ['letsencrypt = letsencrypt:main']
-    }
-)
diff --git a/letsencrypt-auto-source/tests/oraclelinux6_tests.sh b/letsencrypt-auto-source/tests/oraclelinux6_tests.sh
deleted file mode 100644
index f3fd952f305..00000000000
--- a/letsencrypt-auto-source/tests/oraclelinux6_tests.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-# Start by making sure your system is up-to-date:
-yum update -y >/dev/null
-
-LE_AUTO_PY_34="certbot/letsencrypt-auto-source/letsencrypt-auto_py_34"
-LE_AUTO="certbot/letsencrypt-auto-source/letsencrypt-auto"
-
-# Apply installation instructions from official documentation:
-# https://certbot.eff.org/lets-encrypt/centosrhel6-other
-cp "$LE_AUTO" /usr/local/bin/certbot-auto
-chown root /usr/local/bin/certbot-auto
-chmod 0755 /usr/local/bin/certbot-auto
-LE_AUTO=/usr/local/bin/certbot-auto
-
-# Last version of certbot-auto that was bootstraping Python 3.4 for CentOS 6 users
-INITIAL_CERTBOT_VERSION_PY34="certbot 0.38.0"
-
-# Check bootstrap from current certbot-auto will fail, because SCL is not enabled.
-set +o pipefail
-if ! "$LE_AUTO" -n 2>&1 | grep -q "Enable the SCL repository and try running Certbot again."; then
-  echo "ERROR: Bootstrap was not aborted although SCL was not installed!"
-  exit 1
-fi
-set -o pipefail
-
-echo "PASSED: Bootstrap was aborted since SCL was not installed."
-
-# Bootstrap from the old letsencrypt-auto, Python 3.4 will be installed from EPEL.
-"$LE_AUTO_PY_34" --no-self-upgrade -n --install-only >/dev/null 2>/dev/null
-
-# Ensure Python 3.4 is installed
-if ! command -v python3.4 &>/dev/null; then
-  echo "ERROR: old letsencrypt-auto failed to install Python3.4 using letsencrypt-auto < 0.37.0 when only Python2.6 is present."
-  exit 1
-fi
-
-echo "PASSED: Bootstrap from old letsencrypt-auto succeeded and installed Python 3.4"
-
-# Expect certbot-auto to skip rebootstrapping with a warning since SCL is not installed.
-if ! "$LE_AUTO" --non-interactive --version 2>&1 | grep -q "This requires manual user intervention"; then
-  echo "FAILED: Script certbot-auto did not print a warning about needing manual intervention!"
-  exit 1
-fi
-
-echo "PASSED: Script certbot-auto did not rebootstrap."
-
-# NB: Readline has an issue on all Python versions for OL 6, making `certbot --version`
-# output an unprintable ASCII character on a new line at the end.
-# So we take the second last line of the output.
-version=$($LE_AUTO --version 2>/dev/null | tail -2 | head -1)
-
-if [ "$version" != "$INITIAL_CERTBOT_VERSION_PY34" ]; then
-  echo "ERROR: Script certbot-auto upgraded certbot in a non-interactive shell while SCL was not enabled."
-  exit 1
-fi
-
-echo "PASSED: Script certbot-auto did not upgrade certbot but started it successfully while SCL was not enabled."
-
-# Enable SCL
-yum install -y oracle-softwarecollection-release-el6 >/dev/null
-
-# Expect certbot-auto to bootstrap successfully since SCL is available.
-"$LE_AUTO" -n --version &>/dev/null
-
-if [ "$(/opt/eff.org/certbot/venv/bin/python -V 2>&1 | cut -d" " -f2 | cut -d. -f1-2)" != "3.6" ]; then
-  echo "ERROR: Script certbot-auto failed to bootstrap and install Python 3.6 while SCL is available."
-  exit 1
-fi
-
-if ! /opt/eff.org/certbot/venv/bin/certbot --version > /dev/null 2> /dev/null; then
-  echo "ERROR: Script certbot-auto did not install certbot correctly while SCL is enabled."
-  exit 1
-fi
-
-echo "PASSED: Script certbot-auto correctly bootstraped Certbot using rh-python36 when SCL is available."
-
-# Expect certbot-auto will be totally silent now that everything has been correctly boostraped.
-OUTPUT_LEN=$("$LE_AUTO" --install-only --no-self-upgrade --quiet 2>&1 | wc -c)
-if [ "$OUTPUT_LEN" != 0 ]; then
-    echo certbot-auto produced unexpected output!
-    exit 1
-fi
-
-echo "PASSED: Script certbot-auto did not print anything in quiet mode."
diff --git a/letsencrypt-auto-source/tests/signing.key b/letsencrypt-auto-source/tests/signing.key
deleted file mode 100644
index b9964d00cbe..00000000000
--- a/letsencrypt-auto-source/tests/signing.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAsMoSzLYQ7E1sdSOkwelgtzKIh2qi3bpXuYtcfFC0XrvWig07
-1NwIj+dZiT0OLZ2hPispEH0B7ISuuWg1ll7GhFW0VdbxL6JdGzS2ShNWkX9hE9z+
-j8VqwDPOBn3ZHm03qwpYkBDwQib3KqOdYbTTuUtJmmGcuk3a9Aq/sCT6DdfmTSdP
-5asdQYwIcaQreDrOosaS84DTWI3IU+UYJVglLsIVPBuy9IcgHidUQ96hJnoPsDCW
-sHwX62495QKEarauyKQrJzFes0EY95orDM47Z5o/NDiQB11m91yNB0MmPYY9QSbn
-OA9j7IaaC97AwRLuwXY+/R2ablTcxurWou68iQIDAQABAoIBAQCJE3W2Mqk2f+XL
-geKa1BjAkzcXQJCduYGRhUQlw/HGzoBPtGki56Tf53MeHTAkIGfIq3CAr1zRhiNv
-8SQzvrLQIx/buvhxhcQJdzqsfwgNcqXT3/OliF34P3LMx8GUfPy/6xq2Qdv4fvwA
-nLJH8wyDTKP6RxtdvUY7GSZ+Ln2QQv/3Nco7tax4GHNGom8iSgeH/YKTDnvitdqh
-a0fr930QzU39TfOftLmasdmKUOIg8G2wr4Sy6Kn060+OUoQr1fZF5mnLvvQeILCK
-uav91JkIeMLggzk+t88IJUFWdOoxv5hWTnNzHyt+/GYfovyRz2fKQMwzdh1F8iM5
-+867rEb9AoGBANn1ncemJBedDshStdCBUH0+2ExPrawveaXOZKnx8/VGFXNi0hAf
-KzkntMWd5g5kB077FtKO9CYTBvK4pZBWIFLcJEqAz88JeXME6dfUbRucDr72ko+l
-rcLHXj7F0IDVzj/9CphMGAhC9J/4YW9SPcSbMw6dQ6xOk73f1Vowve0DAoGBAM+k
-/F+hVqCS3f22Bg9KuDtx+zCydaZxC842DgIkV1SO2iFhNHjnpQ5EIR0WrSYeV2n+
-rD7kVs5OH1HvnGScHaQKtAVqZClSwF14jzE+Aj8XDwxiHLSOhJgKlzfVX7h1ymMh
-7fsslDl6xNGQ+40gubhkCLT5qABFKy1mrZ8b+3yDAoGAGLGUI6d2FVrM7vM3+Bx+
-gwIYvWSVl5l1XcypaPupmRNMoNsEU6FEY2BVQcJm6yB4F4GpD0f0709ejSdQUq7/
-UIPydKJtaNZ49QgMelBt4B/pJ8eFyVKLAjNWQSRmQAJ5MJS5m5Gbc2wqjOk2GMen
-idvPiAtXPHFWmb9/S42UJwMCgYEAjymAe2qgcGtyNNfIC8kHhqzKdEPGi/ALJKzu
-MZnewEURrcv4QpfrnA9rCUQ2Mz7eJA1bsqz6EJmaTIK4wEFGynA6uDUnQ7pzOL7D
-cz7+i4MZc/89LVvJnY5Hvk4WBfboiDq/etq8g3jatGaSmTYD9la6DhTHORB3eYD+
-meHQHYMCgYEA18y9hnx2k4vNeBei4YXF4pAvKdwKLQD+CcP9ljb3VT+kXktjRA1C
-aWj3HhMwvcxtttfkQzEnwwGRAkTEtNewJ8KFxhmc9nYElZTNZ+SuHD5Dkv8xqoj8
-NvG8rU1eiEyPwE2wQxpM5JLqbo7IWtR0dmptjKoF1gRxn6Wh4TwEiHA=
------END RSA PRIVATE KEY-----
diff --git a/letsencrypt-auto-source/tests/uname_wrapper.sh b/letsencrypt-auto-source/tests/uname_wrapper.sh
deleted file mode 100644
index df1f568c654..00000000000
--- a/letsencrypt-auto-source/tests/uname_wrapper.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-uname_output=$(/bin/uname_orig "$@")
-
-if [ "$UNAME_FAKE_32BITS" = true ]; then
-    uname_output="${uname_output//x86_64/i686}"
-fi
-
-echo "$uname_output"
diff --git a/tests/letstest/scripts/test_leauto_upgrades.sh b/tests/letstest/scripts/test_leauto_upgrades.sh
index 51ff640c520..1eeafad2107 100755
--- a/tests/letstest/scripts/test_leauto_upgrades.sh
+++ b/tests/letstest/scripts/test_leauto_upgrades.sh
@@ -105,15 +105,10 @@ if ./letsencrypt-auto -v --debug --version | grep "WARNING: couldn't find Python
     exit 1
 fi
 
-# On systems like Debian where certbot-auto is deprecated, we expect it to
-# leave existing Certbot installations unmodified so we check for the same
-# version that was initially installed below.  Once certbot-auto is deprecated
-# on RHEL systems, we can unconditionally check for INITIAL_VERSION.
-if [ -f /etc/debian_version ]; then
-    EXPECTED_VERSION="$INITIAL_VERSION"
-else
-    EXPECTED_VERSION=$(grep -m1 LE_AUTO_VERSION certbot-auto | cut -d\" -f2)
-fi
+# Since certbot-auto is deprecated, we expect it to leave existing Certbot
+# installations unmodified so we check for the same version that was initially
+# installed below.
+EXPECTED_VERSION="$INITIAL_VERSION"
 
 if ! /opt/eff.org/certbot/venv/bin/letsencrypt --version 2>&1 | tail -n1 | grep "^certbot $EXPECTED_VERSION$" ; then
     echo unexpected certbot version found
@@ -124,22 +119,3 @@ if ! diff letsencrypt-auto letsencrypt-auto-source/letsencrypt-auto ; then
     echo letsencrypt-auto and letsencrypt-auto-source/letsencrypt-auto differ
     exit 1
 fi
-
-if [ "$RUN_RHEL6_TESTS" = 1 ]; then
-    # Add the SCL python release to PATH in order to resolve python3 command
-    PATH="/opt/rh/rh-python36/root/usr/bin:$PATH"
-    if ! command -v python3; then
-        echo "Python3 wasn't properly installed"
-        exit 1
-    fi
-    if [ "$(/opt/eff.org/certbot/venv/bin/python -V 2>&1 | cut -d" " -f 2 | cut -d. -f1)" != 3 ]; then
-        echo "Python3 wasn't used in venv!"
-        exit 1
-    fi
-
-    if [ "$("$PYTHON_NAME" tools/readlink.py $OLD_VENV_PATH)" != "/opt/eff.org/certbot/venv" ]; then
-        echo symlink from old venv path not properly created!
-        exit 1
-    fi
-fi
-echo upgrade appeared to be successful
diff --git a/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh b/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh
index 15cf9ee1b1c..fc54359166b 100755
--- a/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh
+++ b/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh
@@ -16,58 +16,14 @@ sudo chown root "$LE_AUTO_PATH"
 sudo chmod 0755 "$LE_AUTO_PATH"
 export PATH="$LE_AUTO_DIR:$PATH"
 
-# On systems like Debian where certbot-auto is deprecated, we expect
-# certbot-auto to error and refuse to install Certbot.  Once certbot-auto is
-# deprecated on RHEL systems, we can unconditionally run this code.
-if [ -f /etc/debian_version ]; then
-    set +o pipefail
-    if ! letsencrypt-auto --debug --version | grep "Certbot cannot be installed."; then
-        echo "letsencrypt-auto didn't report being uninstallable."
-        exit 1
-    fi
-    if [ ${PIPESTATUS[0]} != 1 ]; then
-        echo "letsencrypt-auto didn't exit with status 1 as expected"
-        exit 1
-    fi
-    # letsencrypt-auto is deprecated and cannot be installed on this system so
-    # we cannot run the rest of this test.
-    exit 0
-fi
-
-letsencrypt-auto --os-packages-only --debug --version
-
-# This script sets the environment variables PYTHON_NAME, VENV_PATH, and
-# VENV_SCRIPT based on the version of Python available on the system. For
-# instance, Fedora uses Python 3 and Python 2 is not installed.
-. tests/letstest/scripts/set_python_envvars.sh
-
-# Create a venv-like layout at the old virtual environment path to test that a
-# symlink is properly created when letsencrypt-auto runs.
-HOME=${HOME:-~root}
-XDG_DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
-OLD_VENV_BIN="$XDG_DATA_HOME/letsencrypt/bin"
-mkdir -p "$OLD_VENV_BIN"
-touch "$OLD_VENV_BIN/letsencrypt"
-
-letsencrypt-auto certonly --no-self-upgrade -v --standalone --debug \
-                   --text --agree-tos \
-                   --renew-by-default --redirect \
-                   --register-unsafely-without-email \
-                   --domain $PUBLIC_HOSTNAME --server $BOULDER_URL
-
-LINK_PATH=$("$PYTHON_NAME" tools/readlink.py ${XDG_DATA_HOME:-~/.local/share}/letsencrypt)
-if [ "$LINK_PATH" != "/opt/eff.org/certbot/venv" ]; then
-    echo symlink from old venv path not properly created!
+# Since certbot-auto is deprecated, we expect certbot-auto to error and
+# refuse to install Certbot.
+set +o pipefail
+if ! letsencrypt-auto --debug --version | grep "Certbot cannot be installed."; then
+    echo "letsencrypt-auto didn't report being uninstallable."
     exit 1
 fi
-
-if ! letsencrypt-auto --help --no-self-upgrade | grep -F "letsencrypt-auto [SUBCOMMAND]"; then
-    echo "letsencrypt-auto not included in help output!"
-    exit 1
-fi
-
-OUTPUT_LEN=$(letsencrypt-auto --install-only --no-self-upgrade --quiet 2>&1 | wc -c)
-if [ "$OUTPUT_LEN" != 0 ]; then
-    echo letsencrypt-auto produced unexpected output!
+if [ ${PIPESTATUS[0]} != 1 ]; then
+    echo "letsencrypt-auto didn't exit with status 1 as expected"
     exit 1
 fi