175 files changed, 1899 insertions, 1715 deletions

diff --git a/cloudinit/config/tests/test_mounts.py b/cloudinit/config/tests/test_mounts.py
deleted file mode 100644
index 56510fd6..00000000
--- a/cloudinit/config/tests/test_mounts.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-from unittest import mock
-
-import pytest
-
-from cloudinit.config.cc_mounts import create_swapfile
-from cloudinit.subp import ProcessExecutionError
-
-
-M_PATH = 'cloudinit.config.cc_mounts.'
-
-
-class TestCreateSwapfile:
-
-    @pytest.mark.parametrize('fstype', ('xfs', 'btrfs', 'ext4', 'other'))
-    @mock.patch(M_PATH + 'util.get_mount_info')
-    @mock.patch(M_PATH + 'subp.subp')
-    def test_happy_path(self, m_subp, m_get_mount_info, fstype, tmpdir):
-        swap_file = tmpdir.join("swap-file")
-        fname = str(swap_file)
-
-        # Some of the calls to subp.subp should create the swap file; this
-        # roughly approximates that
-        m_subp.side_effect = lambda *args, **kwargs: swap_file.write('')
-
-        m_get_mount_info.return_value = (mock.ANY, fstype)
-
-        create_swapfile(fname, '')
-        assert mock.call(['mkswap', fname]) in m_subp.call_args_list
-
-    @mock.patch(M_PATH + "util.get_mount_info")
-    @mock.patch(M_PATH + "subp.subp")
-    def test_fallback_from_fallocate_to_dd(
-        self, m_subp, m_get_mount_info, caplog, tmpdir
-    ):
-        swap_file = tmpdir.join("swap-file")
-        fname = str(swap_file)
-
-        def subp_side_effect(cmd, *args, **kwargs):
-            # Mock fallocate failing, to initiate fallback
-            if cmd[0] == "fallocate":
-                raise ProcessExecutionError()
-
-        m_subp.side_effect = subp_side_effect
-        # Use ext4 so both fallocate and dd are valid swap creation methods
-        m_get_mount_info.return_value = (mock.ANY, "ext4")
-
-        create_swapfile(fname, "")
-
-        cmds = [args[0][0] for args, _kwargs in m_subp.call_args_list]
-        assert "fallocate" in cmds, "fallocate was not called"
-        assert "dd" in cmds, "fallocate failure did not fallback to dd"
-
-        assert cmds.index("dd") > cmds.index(
-            "fallocate"
-        ), "dd ran before fallocate"
-
-        assert mock.call(["mkswap", fname]) in m_subp.call_args_list
-
-        msg = "fallocate swap creation failed, will attempt with dd"
-        assert msg in caplog.text
diff --git a/cloudinit/config/tests/test_resolv_conf.py b/cloudinit/config/tests/test_resolv_conf.py
deleted file mode 100644
index aff110e5..00000000
--- a/cloudinit/config/tests/test_resolv_conf.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import pytest
-
-from unittest import mock
-from cloudinit.config.cc_resolv_conf import generate_resolv_conf
-from tests.unittests.util import TestingDistro
-
-EXPECTED_HEADER = """\
-# Your system has been configured with 'manage-resolv-conf' set to true.
-# As a result, cloud-init has written this file with configuration data
-# that it has been provided. Cloud-init, by default, will write this file
-# a single time (PER_ONCE).
-#\n\n"""
-
-
-class TestGenerateResolvConf:
-
-    dist = TestingDistro()
-    tmpl_fn = "templates/resolv.conf.tmpl"
-
-    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
-    def test_dist_resolv_conf_fn(self, m_render_to_file):
-        self.dist.resolve_conf_fn = "/tmp/resolv-test.conf"
-        generate_resolv_conf(self.tmpl_fn,
-                             mock.MagicMock(),
-                             self.dist.resolve_conf_fn)
-
-        assert [
-            mock.call(mock.ANY, self.dist.resolve_conf_fn, mock.ANY)
-        ] == m_render_to_file.call_args_list
-
-    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
-    def test_target_fname_is_used_if_passed(self, m_render_to_file):
-        path = "/use/this/path"
-        generate_resolv_conf(self.tmpl_fn, mock.MagicMock(), path)
-
-        assert [
-            mock.call(mock.ANY, path, mock.ANY)
-        ] == m_render_to_file.call_args_list
-
-    # Patch in templater so we can assert on the actual generated content
-    @mock.patch("cloudinit.templater.util.write_file")
-    # Parameterise with the value to be passed to generate_resolv_conf as the
-    # params parameter, and the expected line after the header as
-    # expected_extra_line.
-    @pytest.mark.parametrize(
-        "params,expected_extra_line",
-        [
-            # No options
-            ({}, None),
-            # Just a true flag
-            ({"options": {"foo": True}}, "options foo"),
-            # Just a false flag
-            ({"options": {"foo": False}}, None),
-            # Just an option
-            ({"options": {"foo": "some_value"}}, "options foo:some_value"),
-            # A true flag and an option
-            (
-                {"options": {"foo": "some_value", "bar": True}},
-                "options bar foo:some_value",
-            ),
-            # Two options
-            (
-                {"options": {"foo": "some_value", "bar": "other_value"}},
-                "options bar:other_value foo:some_value",
-            ),
-            # Everything
-            (
-                {
-                    "options": {
-                        "foo": "some_value",
-                        "bar": "other_value",
-                        "baz": False,
-                        "spam": True,
-                    }
-                },
-                "options spam bar:other_value foo:some_value",
-            ),
-        ],
-    )
-    def test_flags_and_options(
-        self, m_write_file, params, expected_extra_line
-    ):
-        target_fn = "/etc/resolv.conf"
-        generate_resolv_conf(self.tmpl_fn, params, target_fn)
-
-        expected_content = EXPECTED_HEADER
-        if expected_extra_line is not None:
-            # If we have any extra lines, expect a trailing newline
-            expected_content += "\n".join([expected_extra_line, ""])
-        assert [
-            mock.call(mock.ANY, expected_content, mode=mock.ANY)
-        ] == m_write_file.call_args_list
diff --git a/cloudinit/tests/test_gpg.py b/cloudinit/tests/test_gpg.py
deleted file mode 100644
index 311dfad6..00000000
--- a/cloudinit/tests/test_gpg.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-"""Test gpg module."""
-
-from unittest import mock
-
-from cloudinit import gpg
-from cloudinit import subp
-from cloudinit.tests.helpers import CiTestCase
-
-
-@mock.patch("cloudinit.gpg.time.sleep")
-@mock.patch("cloudinit.gpg.subp.subp")
-class TestReceiveKeys(CiTestCase):
-    """Test the recv_key method."""
-
-    def test_retries_on_subp_exc(self, m_subp, m_sleep):
-        """retry should be done on gpg receive keys failure."""
-        retries = (1, 2, 4)
-        my_exc = subp.ProcessExecutionError(
-            stdout='', stderr='', exit_code=2, cmd=['mycmd'])
-        m_subp.side_effect = (my_exc, my_exc, ('', ''))
-        gpg.recv_key("ABCD", "keyserver.example.com", retries=retries)
-        self.assertEqual([mock.call(1), mock.call(2)], m_sleep.call_args_list)
-
-    def test_raises_error_after_retries(self, m_subp, m_sleep):
-        """If the final run fails, error should be raised."""
-        naplen = 1
-        keyid, keyserver = ("ABCD", "keyserver.example.com")
-        m_subp.side_effect = subp.ProcessExecutionError(
-            stdout='', stderr='', exit_code=2, cmd=['mycmd'])
-        with self.assertRaises(ValueError) as rcm:
-            gpg.recv_key(keyid, keyserver, retries=(naplen,))
-        self.assertIn(keyid, str(rcm.exception))
-        self.assertIn(keyserver, str(rcm.exception))
-        m_sleep.assert_called_with(naplen)
-
-    def test_no_retries_on_none(self, m_subp, m_sleep):
-        """retry should not be done if retries is None."""
-        m_subp.side_effect = subp.ProcessExecutionError(
-            stdout='', stderr='', exit_code=2, cmd=['mycmd'])
-        with self.assertRaises(ValueError):
-            gpg.recv_key("ABCD", "keyserver.example.com", retries=None)
-        m_sleep.assert_not_called()
-
-    def test_expected_gpg_command(self, m_subp, m_sleep):
-        """Verify gpg is called with expected args."""
-        key, keyserver = ("DEADBEEF", "keyserver.example.com")
-        retries = (1, 2, 4)
-        m_subp.return_value = ('', '')
-        gpg.recv_key(key, keyserver, retries=retries)
-        m_subp.assert_called_once_with(
-            ['gpg', '--no-tty',
-             '--keyserver=%s' % keyserver, '--recv-keys', key],
-            capture=True)
-        m_sleep.assert_not_called()
diff --git a/cloudinit/tests/test_util.py b/cloudinit/tests/test_util.py
deleted file mode 100644
index 7a3175f3..00000000
--- a/cloudinit/tests/test_util.py
+++ /dev/null
@@ -1,1187 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Tests for cloudinit.util"""
-
-import base64
-import logging
-import json
-import platform
-import pytest
-
-import cloudinit.util as util
-from cloudinit import subp
-
-from cloudinit.tests.helpers import CiTestCase, mock
-from textwrap import dedent
-
-LOG = logging.getLogger(__name__)
-
-MOUNT_INFO = [
-    '68 0 8:3 / / ro,relatime shared:1 - btrfs /dev/sda1 ro,attr2,inode64',
-    '153 68 254:0 / /home rw,relatime shared:101 - xfs /dev/sda2 rw,attr2'
-]
-
-OS_RELEASE_SLES = dedent("""\
-    NAME="SLES"
-    VERSION="12-SP3"
-    VERSION_ID="12.3"
-    PRETTY_NAME="SUSE Linux Enterprise Server 12 SP3"
-    ID="sles"
-    ANSI_COLOR="0;32"
-    CPE_NAME="cpe:/o:suse:sles:12:sp3"
-""")
-
-OS_RELEASE_OPENSUSE = dedent("""\
-    NAME="openSUSE Leap"
-    VERSION="42.3"
-    ID=opensuse
-    ID_LIKE="suse"
-    VERSION_ID="42.3"
-    PRETTY_NAME="openSUSE Leap 42.3"
-    ANSI_COLOR="0;32"
-    CPE_NAME="cpe:/o:opensuse:leap:42.3"
-    BUG_REPORT_URL="https://bugs.opensuse.org"
-    HOME_URL="https://www.opensuse.org/"
-""")
-
-OS_RELEASE_OPENSUSE_L15 = dedent("""\
-    NAME="openSUSE Leap"
-    VERSION="15.0"
-    ID="opensuse-leap"
-    ID_LIKE="suse opensuse"
-    VERSION_ID="15.0"
-    PRETTY_NAME="openSUSE Leap 15.0"
-    ANSI_COLOR="0;32"
-    CPE_NAME="cpe:/o:opensuse:leap:15.0"
-    BUG_REPORT_URL="https://bugs.opensuse.org"
-    HOME_URL="https://www.opensuse.org/"
-""")
-
-OS_RELEASE_OPENSUSE_TW = dedent("""\
-    NAME="openSUSE Tumbleweed"
-    ID="opensuse-tumbleweed"
-    ID_LIKE="opensuse suse"
-    VERSION_ID="20180920"
-    PRETTY_NAME="openSUSE Tumbleweed"
-    ANSI_COLOR="0;32"
-    CPE_NAME="cpe:/o:opensuse:tumbleweed:20180920"
-    BUG_REPORT_URL="https://bugs.opensuse.org"
-    HOME_URL="https://www.opensuse.org/"
-""")
-
-OS_RELEASE_CENTOS = dedent("""\
-    NAME="CentOS Linux"
-    VERSION="7 (Core)"
-    ID="centos"
-    ID_LIKE="rhel fedora"
-    VERSION_ID="7"
-    PRETTY_NAME="CentOS Linux 7 (Core)"
-    ANSI_COLOR="0;31"
-    CPE_NAME="cpe:/o:centos:centos:7"
-    HOME_URL="https://www.centos.org/"
-    BUG_REPORT_URL="https://bugs.centos.org/"
-
-    CENTOS_MANTISBT_PROJECT="CentOS-7"
-    CENTOS_MANTISBT_PROJECT_VERSION="7"
-    REDHAT_SUPPORT_PRODUCT="centos"
-    REDHAT_SUPPORT_PRODUCT_VERSION="7"
-""")
-
-OS_RELEASE_REDHAT_7 = dedent("""\
-    NAME="Red Hat Enterprise Linux Server"
-    VERSION="7.5 (Maipo)"
-    ID="rhel"
-    ID_LIKE="fedora"
-    VARIANT="Server"
-    VARIANT_ID="server"
-    VERSION_ID="7.5"
-    PRETTY_NAME="Red Hat"
-    ANSI_COLOR="0;31"
-    CPE_NAME="cpe:/o:redhat:enterprise_linux:7.5:GA:server"
-    HOME_URL="https://www.redhat.com/"
-    BUG_REPORT_URL="https://bugzilla.redhat.com/"
-
-    REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 7"
-    REDHAT_BUGZILLA_PRODUCT_VERSION=7.5
-    REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
-    REDHAT_SUPPORT_PRODUCT_VERSION="7.5"
-""")
-
-OS_RELEASE_ALMALINUX_8 = dedent("""\
-    NAME="AlmaLinux"
-    VERSION="8.3 (Purple Manul)"
-    ID="almalinux"
-    ID_LIKE="rhel centos fedora"
-    VERSION_ID="8.3"
-    PLATFORM_ID="platform:el8"
-    PRETTY_NAME="AlmaLinux 8.3 (Purple Manul)"
-    ANSI_COLOR="0;34"
-    CPE_NAME="cpe:/o:almalinux:almalinux:8.3:GA"
-    HOME_URL="https://almalinux.org/"
-    BUG_REPORT_URL="https://bugs.almalinux.org/"
-
-    ALMALINUX_MANTISBT_PROJECT="AlmaLinux-8"
-    ALMALINUX_MANTISBT_PROJECT_VERSION="8.3"
-""")
-
-OS_RELEASE_EUROLINUX_7 = dedent("""\
-    VERSION="7.9 (Minsk)"
-    ID="eurolinux"
-    ID_LIKE="rhel scientific centos fedora"
-    VERSION_ID="7.9"
-    PRETTY_NAME="EuroLinux 7.9 (Minsk)"
-    ANSI_COLOR="0;31"
-    CPE_NAME="cpe:/o:eurolinux:eurolinux:7.9:GA"
-    HOME_URL="http://www.euro-linux.com/"
-    BUG_REPORT_URL="mailto:support@euro-linux.com"
-    REDHAT_BUGZILLA_PRODUCT="EuroLinux 7"
-    REDHAT_BUGZILLA_PRODUCT_VERSION=7.9
-    REDHAT_SUPPORT_PRODUCT="EuroLinux"
-    REDHAT_SUPPORT_PRODUCT_VERSION="7.9"
-""")
-
-OS_RELEASE_EUROLINUX_8 = dedent("""\
-    NAME="EuroLinux"
-    VERSION="8.4 (Vaduz)"
-    ID="eurolinux"
-    ID_LIKE="rhel fedora centos"
-    VERSION_ID="8.4"
-    PLATFORM_ID="platform:el8"
-    PRETTY_NAME="EuroLinux 8.4 (Vaduz)"
-    ANSI_COLOR="0;34"
-    CPE_NAME="cpe:/o:eurolinux:eurolinux:8"
-    HOME_URL="https://www.euro-linux.com/"
-    BUG_REPORT_URL="https://github.com/EuroLinux/eurolinux-distro-bugs-and-rfc/"
-    REDHAT_SUPPORT_PRODUCT="EuroLinux"
-    REDHAT_SUPPORT_PRODUCT_VERSION="8"
-""")
-
-OS_RELEASE_ROCKY_8 = dedent("""\
-    NAME="Rocky Linux"
-    VERSION="8.3 (Green Obsidian)"
-    ID="rocky"
-    ID_LIKE="rhel fedora"
-    VERSION_ID="8.3"
-    PLATFORM_ID="platform:el8"
-    PRETTY_NAME="Rocky Linux 8.3 (Green Obsidian)"
-    ANSI_COLOR="0;31"
-    CPE_NAME="cpe:/o:rocky:rocky:8"
-    HOME_URL="https://rockylinux.org/"
-    BUG_REPORT_URL="https://bugs.rockylinux.org/"
-    ROCKY_SUPPORT_PRODUCT="Rocky Linux"
-    ROCKY_SUPPORT_PRODUCT_VERSION="8"
-""")
-
-OS_RELEASE_VIRTUOZZO_8 = dedent("""\
-    NAME="Virtuozzo Linux"
-    VERSION="8"
-    ID="virtuozzo"
-    ID_LIKE="rhel fedora"
-    VERSION_ID="8"
-    PLATFORM_ID="platform:el8"
-    PRETTY_NAME="Virtuozzo Linux"
-    ANSI_COLOR="0;31"
-    CPE_NAME="cpe:/o:virtuozzoproject:vzlinux:8"
-    HOME_URL="https://www.vzlinux.org"
-    BUG_REPORT_URL="https://bugs.openvz.org"
-""")
-
-OS_RELEASE_CLOUDLINUX_8 = dedent("""\
-    NAME="CloudLinux"
-    VERSION="8.4 (Valery Rozhdestvensky)"
-    ID="cloudlinux"
-    ID_LIKE="rhel fedora centos"
-    VERSION_ID="8.4"
-    PLATFORM_ID="platform:el8"
-    PRETTY_NAME="CloudLinux 8.4 (Valery Rozhdestvensky)"
-    ANSI_COLOR="0;31"
-    CPE_NAME="cpe:/o:cloudlinux:cloudlinux:8.4:GA:server"
-    HOME_URL="https://www.cloudlinux.com/"
-    BUG_REPORT_URL="https://www.cloudlinux.com/support"
-""")
-
-OS_RELEASE_OPENEULER_20 = dedent("""\
-    NAME="openEuler"
-    VERSION="20.03 (LTS-SP2)"
-    ID="openEuler"
-    VERSION_ID="20.03"
-    PRETTY_NAME="openEuler 20.03 (LTS-SP2)"
-    ANSI_COLOR="0;31"
-""")
-
-REDHAT_RELEASE_CENTOS_6 = "CentOS release 6.10 (Final)"
-REDHAT_RELEASE_CENTOS_7 = "CentOS Linux release 7.5.1804 (Core)"
-REDHAT_RELEASE_REDHAT_6 = (
-    "Red Hat Enterprise Linux Server release 6.10 (Santiago)")
-REDHAT_RELEASE_REDHAT_7 = (
-    "Red Hat Enterprise Linux Server release 7.5 (Maipo)")
-REDHAT_RELEASE_ALMALINUX_8 = (
-    "AlmaLinux release 8.3 (Purple Manul)")
-REDHAT_RELEASE_EUROLINUX_7 = "EuroLinux release 7.9 (Minsk)"
-REDHAT_RELEASE_EUROLINUX_8 = "EuroLinux release 8.4 (Vaduz)"
-REDHAT_RELEASE_ROCKY_8 = (
-    "Rocky Linux release 8.3 (Green Obsidian)")
-REDHAT_RELEASE_VIRTUOZZO_8 = (
-    "Virtuozzo Linux release 8")
-REDHAT_RELEASE_CLOUDLINUX_8 = (
-    "CloudLinux release 8.4 (Valery Rozhdestvensky)")
-OS_RELEASE_DEBIAN = dedent("""\
-    PRETTY_NAME="Debian GNU/Linux 9 (stretch)"
-    NAME="Debian GNU/Linux"
-    VERSION_ID="9"
-    VERSION="9 (stretch)"
-    ID=debian
-    HOME_URL="https://www.debian.org/"
-    SUPPORT_URL="https://www.debian.org/support"
-    BUG_REPORT_URL="https://bugs.debian.org/"
-""")
-
-OS_RELEASE_UBUNTU = dedent("""\
-    NAME="Ubuntu"\n
-    # comment test
-    VERSION="16.04.3 LTS (Xenial Xerus)"\n
-    ID=ubuntu\n
-    ID_LIKE=debian\n
-    PRETTY_NAME="Ubuntu 16.04.3 LTS"\n
-    VERSION_ID="16.04"\n
-    HOME_URL="http://www.ubuntu.com/"\n
-    SUPPORT_URL="http://help.ubuntu.com/"\n
-    BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"\n
-    VERSION_CODENAME=xenial\n
-    UBUNTU_CODENAME=xenial\n
-""")
-
-OS_RELEASE_PHOTON = ("""\
-        NAME="VMware Photon OS"
-        VERSION="4.0"
-        ID=photon
-        VERSION_ID=4.0
-        PRETTY_NAME="VMware Photon OS/Linux"
-        ANSI_COLOR="1;34"
-        HOME_URL="https://vmware.github.io/photon/"
-        BUG_REPORT_URL="https://github.com/vmware/photon/issues"
-""")
-
-
-class FakeCloud(object):
-
-    def __init__(self, hostname, fqdn):
-        self.hostname = hostname
-        self.fqdn = fqdn
-        self.calls = []
-
-    def get_hostname(self, fqdn=None, metadata_only=None):
-        myargs = {}
-        if fqdn is not None:
-            myargs['fqdn'] = fqdn
-        if metadata_only is not None:
-            myargs['metadata_only'] = metadata_only
-        self.calls.append(myargs)
-        if fqdn:
-            return self.fqdn
-        return self.hostname
-
-
-class TestUtil(CiTestCase):
-
-    def test_parse_mount_info_no_opts_no_arg(self):
-        result = util.parse_mount_info('/home', MOUNT_INFO, LOG)
-        self.assertEqual(('/dev/sda2', 'xfs', '/home'), result)
-
-    def test_parse_mount_info_no_opts_arg(self):
-        result = util.parse_mount_info('/home', MOUNT_INFO, LOG, False)
-        self.assertEqual(('/dev/sda2', 'xfs', '/home'), result)
-
-    def test_parse_mount_info_with_opts(self):
-        result = util.parse_mount_info('/', MOUNT_INFO, LOG, True)
-        self.assertEqual(
-            ('/dev/sda1', 'btrfs', '/', 'ro,relatime'),
-            result
-        )
-
-    @mock.patch('cloudinit.util.get_mount_info')
-    def test_mount_is_rw(self, m_mount_info):
-        m_mount_info.return_value = ('/dev/sda1', 'btrfs', '/', 'rw,relatime')
-        is_rw = util.mount_is_read_write('/')
-        self.assertEqual(is_rw, True)
-
-    @mock.patch('cloudinit.util.get_mount_info')
-    def test_mount_is_ro(self, m_mount_info):
-        m_mount_info.return_value = ('/dev/sda1', 'btrfs', '/', 'ro,relatime')
-        is_rw = util.mount_is_read_write('/')
-        self.assertEqual(is_rw, False)
-
-
-class TestUptime(CiTestCase):
-
-    @mock.patch('cloudinit.util.boottime')
-    @mock.patch('cloudinit.util.os.path.exists')
-    @mock.patch('cloudinit.util.time.time')
-    def test_uptime_non_linux_path(self, m_time, m_exists, m_boottime):
-        boottime = 1000.0
-        uptime = 10.0
-        m_boottime.return_value = boottime
-        m_time.return_value = boottime + uptime
-        m_exists.return_value = False
-        result = util.uptime()
-        self.assertEqual(str(uptime), result)
-
-
-class TestShellify(CiTestCase):
-
-    def test_input_dict_raises_type_error(self):
-        self.assertRaisesRegex(
-            TypeError, 'Input.*was.*dict.*xpected',
-            util.shellify, {'mykey': 'myval'})
-
-    def test_input_str_raises_type_error(self):
-        self.assertRaisesRegex(
-            TypeError, 'Input.*was.*str.*xpected', util.shellify, "foobar")
-
-    def test_value_with_int_raises_type_error(self):
-        self.assertRaisesRegex(
-            TypeError, 'shellify.*int', util.shellify, ["foo", 1])
-
-    def test_supports_strings_and_lists(self):
-        self.assertEqual(
-            '\n'.join(["#!/bin/sh", "echo hi mom", "'echo' 'hi dad'",
-                       "'echo' 'hi' 'sis'", ""]),
-            util.shellify(["echo hi mom", ["echo", "hi dad"],
-                           ('echo', 'hi', 'sis')]))
-
-    def test_supports_comments(self):
-        self.assertEqual(
-            '\n'.join(["#!/bin/sh", "echo start", "echo end", ""]),
-            util.shellify(["echo start", None, "echo end"]))
-
-
-class TestGetHostnameFqdn(CiTestCase):
-
-    def test_get_hostname_fqdn_from_only_cfg_fqdn(self):
-        """When cfg only has the fqdn key, derive hostname and fqdn from it."""
-        hostname, fqdn = util.get_hostname_fqdn(
-            cfg={'fqdn': 'myhost.domain.com'}, cloud=None)
-        self.assertEqual('myhost', hostname)
-        self.assertEqual('myhost.domain.com', fqdn)
-
-    def test_get_hostname_fqdn_from_cfg_fqdn_and_hostname(self):
-        """When cfg has both fqdn and hostname keys, return them."""
-        hostname, fqdn = util.get_hostname_fqdn(
-            cfg={'fqdn': 'myhost.domain.com', 'hostname': 'other'}, cloud=None)
-        self.assertEqual('other', hostname)
-        self.assertEqual('myhost.domain.com', fqdn)
-
-    def test_get_hostname_fqdn_from_cfg_hostname_with_domain(self):
-        """When cfg has only hostname key which represents a fqdn, use that."""
-        hostname, fqdn = util.get_hostname_fqdn(
-            cfg={'hostname': 'myhost.domain.com'}, cloud=None)
-        self.assertEqual('myhost', hostname)
-        self.assertEqual('myhost.domain.com', fqdn)
-
-    def test_get_hostname_fqdn_from_cfg_hostname_without_domain(self):
-        """When cfg has a hostname without a '.' query cloud.get_hostname."""
-        mycloud = FakeCloud('cloudhost', 'cloudhost.mycloud.com')
-        hostname, fqdn = util.get_hostname_fqdn(
-            cfg={'hostname': 'myhost'}, cloud=mycloud)
-        self.assertEqual('myhost', hostname)
-        self.assertEqual('cloudhost.mycloud.com', fqdn)
-        self.assertEqual(
-            [{'fqdn': True, 'metadata_only': False}], mycloud.calls)
-
-    def test_get_hostname_fqdn_from_without_fqdn_or_hostname(self):
-        """When cfg has neither hostname nor fqdn cloud.get_hostname."""
-        mycloud = FakeCloud('cloudhost', 'cloudhost.mycloud.com')
-        hostname, fqdn = util.get_hostname_fqdn(cfg={}, cloud=mycloud)
-        self.assertEqual('cloudhost', hostname)
-        self.assertEqual('cloudhost.mycloud.com', fqdn)
-        self.assertEqual(
-            [{'fqdn': True, 'metadata_only': False},
-             {'metadata_only': False}], mycloud.calls)
-
-    def test_get_hostname_fqdn_from_passes_metadata_only_to_cloud(self):
-        """Calls to cloud.get_hostname pass the metadata_only parameter."""
-        mycloud = FakeCloud('cloudhost', 'cloudhost.mycloud.com')
-        _hn, _fqdn = util.get_hostname_fqdn(
-            cfg={}, cloud=mycloud, metadata_only=True)
-        self.assertEqual(
-            [{'fqdn': True, 'metadata_only': True},
-             {'metadata_only': True}], mycloud.calls)
-
-
-class TestBlkid(CiTestCase):
-    ids = {
-        "id01": "1111-1111",
-        "id02": "22222222-2222",
-        "id03": "33333333-3333",
-        "id04": "44444444-4444",
-        "id05": "55555555-5555-5555-5555-555555555555",
-        "id06": "66666666-6666-6666-6666-666666666666",
-        "id07": "52894610484658920398",
-        "id08": "86753098675309867530",
-        "id09": "99999999-9999-9999-9999-999999999999",
-    }
-
-    blkid_out = dedent("""\
-        /dev/loop0: TYPE="squashfs"
-        /dev/loop1: TYPE="squashfs"
-        /dev/loop2: TYPE="squashfs"
-        /dev/loop3: TYPE="squashfs"
-        /dev/sda1: UUID="{id01}" TYPE="vfat" PARTUUID="{id02}"
-        /dev/sda2: UUID="{id03}" TYPE="ext4" PARTUUID="{id04}"
-        /dev/sda3: UUID="{id05}" TYPE="ext4" PARTUUID="{id06}"
-        /dev/sda4: LABEL="default" UUID="{id07}" UUID_SUB="{id08}" """
-                       """TYPE="zfs_member" PARTUUID="{id09}"
-        /dev/loop4: TYPE="squashfs"
-      """)
-
-    maxDiff = None
-
-    def _get_expected(self):
-        return ({
-            "/dev/loop0": {"DEVNAME": "/dev/loop0", "TYPE": "squashfs"},
-            "/dev/loop1": {"DEVNAME": "/dev/loop1", "TYPE": "squashfs"},
-            "/dev/loop2": {"DEVNAME": "/dev/loop2", "TYPE": "squashfs"},
-            "/dev/loop3": {"DEVNAME": "/dev/loop3", "TYPE": "squashfs"},
-            "/dev/loop4": {"DEVNAME": "/dev/loop4", "TYPE": "squashfs"},
-            "/dev/sda1": {"DEVNAME": "/dev/sda1", "TYPE": "vfat",
-                          "UUID": self.ids["id01"],
-                          "PARTUUID": self.ids["id02"]},
-            "/dev/sda2": {"DEVNAME": "/dev/sda2", "TYPE": "ext4",
-                          "UUID": self.ids["id03"],
-                          "PARTUUID": self.ids["id04"]},
-            "/dev/sda3": {"DEVNAME": "/dev/sda3", "TYPE": "ext4",
-                          "UUID": self.ids["id05"],
-                          "PARTUUID": self.ids["id06"]},
-            "/dev/sda4": {"DEVNAME": "/dev/sda4", "TYPE": "zfs_member",
-                          "LABEL": "default",
-                          "UUID": self.ids["id07"],
-                          "UUID_SUB": self.ids["id08"],
-                          "PARTUUID": self.ids["id09"]},
-        })
-
-    @mock.patch("cloudinit.subp.subp")
-    def test_functional_blkid(self, m_subp):
-        m_subp.return_value = (
-            self.blkid_out.format(**self.ids), "")
-        self.assertEqual(self._get_expected(), util.blkid())
-        m_subp.assert_called_with(["blkid", "-o", "full"], capture=True,
-                                  decode="replace")
-
-    @mock.patch("cloudinit.subp.subp")
-    def test_blkid_no_cache_uses_no_cache(self, m_subp):
-        """blkid should turn off cache if disable_cache is true."""
-        m_subp.return_value = (
-            self.blkid_out.format(**self.ids), "")
-        self.assertEqual(self._get_expected(),
-                         util.blkid(disable_cache=True))
-        m_subp.assert_called_with(["blkid", "-o", "full", "-c", "/dev/null"],
-                                  capture=True, decode="replace")
-
-
-@mock.patch('cloudinit.subp.subp')
-class TestUdevadmSettle(CiTestCase):
-    def test_with_no_params(self, m_subp):
-        """called with no parameters."""
-        util.udevadm_settle()
-        m_subp.called_once_with(mock.call(['udevadm', 'settle']))
-
-    def test_with_exists_and_not_exists(self, m_subp):
-        """with exists=file where file does not exist should invoke subp."""
-        mydev = self.tmp_path("mydev")
-        util.udevadm_settle(exists=mydev)
-        m_subp.called_once_with(
-            ['udevadm', 'settle', '--exit-if-exists=%s' % mydev])
-
-    def test_with_exists_and_file_exists(self, m_subp):
-        """with exists=file where file does exist should not invoke subp."""
-        mydev = self.tmp_path("mydev")
-        util.write_file(mydev, "foo\n")
-        util.udevadm_settle(exists=mydev)
-        self.assertIsNone(m_subp.call_args)
-
-    def test_with_timeout_int(self, m_subp):
-        """timeout can be an integer."""
-        timeout = 9
-        util.udevadm_settle(timeout=timeout)
-        m_subp.called_once_with(
-            ['udevadm', 'settle', '--timeout=%s' % timeout])
-
-    def test_with_timeout_string(self, m_subp):
-        """timeout can be a string."""
-        timeout = "555"
-        util.udevadm_settle(timeout=timeout)
-        m_subp.assert_called_once_with(
-            ['udevadm', 'settle', '--timeout=%s' % timeout])
-
-    def test_with_exists_and_timeout(self, m_subp):
-        """test call with both exists and timeout."""
-        mydev = self.tmp_path("mydev")
-        timeout = "3"
-        util.udevadm_settle(exists=mydev)
-        m_subp.called_once_with(
-            ['udevadm', 'settle', '--exit-if-exists=%s' % mydev,
-             '--timeout=%s' % timeout])
-
-    def test_subp_exception_raises_to_caller(self, m_subp):
-        m_subp.side_effect = subp.ProcessExecutionError("BOOM")
-        self.assertRaises(subp.ProcessExecutionError, util.udevadm_settle)
-
-
-@mock.patch('os.path.exists')
-class TestGetLinuxDistro(CiTestCase):
-
-    def setUp(self):
-        # python2 has no lru_cache, and therefore, no cache_clear()
-        if hasattr(util.get_linux_distro, "cache_clear"):
-            util.get_linux_distro.cache_clear()
-
-    @classmethod
-    def os_release_exists(self, path):
-        """Side effect function"""
-        if path == '/etc/os-release':
-            return 1
-
-    @classmethod
-    def redhat_release_exists(self, path):
-        """Side effect function """
-        if path == '/etc/redhat-release':
-            return 1
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_distro_quoted_name(self, m_os_release, m_path_exists):
-        """Verify we get the correct name if the os-release file has
-        the distro name in quotes"""
-        m_os_release.return_value = OS_RELEASE_SLES
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('sles', '12.3', platform.machine()), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_distro_bare_name(self, m_os_release, m_path_exists):
-        """Verify we get the correct name if the os-release file does not
-        have the distro name in quotes"""
-        m_os_release.return_value = OS_RELEASE_UBUNTU
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('ubuntu', '16.04', 'xenial'), dist)
-
-    @mock.patch('platform.system')
-    @mock.patch('platform.release')
-    @mock.patch('cloudinit.util._parse_redhat_release')
-    def test_get_linux_freebsd(self, m_parse_redhat_release,
-                               m_platform_release,
-                               m_platform_system, m_path_exists):
-        """Verify we get the correct name and release name on FreeBSD."""
-        m_path_exists.return_value = False
-        m_platform_release.return_value = '12.0-RELEASE-p10'
-        m_platform_system.return_value = 'FreeBSD'
-        m_parse_redhat_release.return_value = {}
-        util.is_BSD.cache_clear()
-        dist = util.get_linux_distro()
-        self.assertEqual(('freebsd', '12.0-RELEASE-p10', ''), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_centos6(self, m_os_release, m_path_exists):
-        """Verify we get the correct name and release name on CentOS 6."""
-        m_os_release.return_value = REDHAT_RELEASE_CENTOS_6
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('centos', '6.10', 'Final'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_centos7_redhat_release(self, m_os_release, m_exists):
-        """Verify the correct release info on CentOS 7 without os-release."""
-        m_os_release.return_value = REDHAT_RELEASE_CENTOS_7
-        m_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('centos', '7.5.1804', 'Core'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_redhat7_osrelease(self, m_os_release, m_path_exists):
-        """Verify redhat 7 read from os-release."""
-        m_os_release.return_value = OS_RELEASE_REDHAT_7
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('redhat', '7.5', 'Maipo'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_redhat7_rhrelease(self, m_os_release, m_path_exists):
-        """Verify redhat 7 read from redhat-release."""
-        m_os_release.return_value = REDHAT_RELEASE_REDHAT_7
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('redhat', '7.5', 'Maipo'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_redhat6_rhrelease(self, m_os_release, m_path_exists):
-        """Verify redhat 6 read from redhat-release."""
-        m_os_release.return_value = REDHAT_RELEASE_REDHAT_6
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('redhat', '6.10', 'Santiago'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_copr_centos(self, m_os_release, m_path_exists):
-        """Verify we get the correct name and release name on COPR CentOS."""
-        m_os_release.return_value = OS_RELEASE_CENTOS
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('centos', '7', 'Core'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_almalinux8_rhrelease(self, m_os_release, m_path_exists):
-        """Verify almalinux 8 read from redhat-release."""
-        m_os_release.return_value = REDHAT_RELEASE_ALMALINUX_8
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('almalinux', '8.3', 'Purple Manul'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_almalinux8_osrelease(self, m_os_release, m_path_exists):
-        """Verify almalinux 8 read from os-release."""
-        m_os_release.return_value = OS_RELEASE_ALMALINUX_8
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('almalinux', '8.3', 'Purple Manul'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_eurolinux7_rhrelease(self, m_os_release, m_path_exists):
-        """Verify eurolinux 7 read from redhat-release."""
-        m_os_release.return_value = REDHAT_RELEASE_EUROLINUX_7
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('eurolinux', '7.9', 'Minsk'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_eurolinux7_osrelease(self, m_os_release, m_path_exists):
-        """Verify eurolinux 7 read from os-release."""
-        m_os_release.return_value = OS_RELEASE_EUROLINUX_7
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('eurolinux', '7.9', 'Minsk'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_eurolinux8_rhrelease(self, m_os_release, m_path_exists):
-        """Verify eurolinux 8 read from redhat-release."""
-        m_os_release.return_value = REDHAT_RELEASE_EUROLINUX_8
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('eurolinux', '8.4', 'Vaduz'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_eurolinux8_osrelease(self, m_os_release, m_path_exists):
-        """Verify eurolinux 8 read from os-release."""
-        m_os_release.return_value = OS_RELEASE_EUROLINUX_8
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('eurolinux', '8.4', 'Vaduz'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_rocky8_rhrelease(self, m_os_release, m_path_exists):
-        """Verify rocky linux 8 read from redhat-release."""
-        m_os_release.return_value = REDHAT_RELEASE_ROCKY_8
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('rocky', '8.3', 'Green Obsidian'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_rocky8_osrelease(self, m_os_release, m_path_exists):
-        """Verify rocky linux 8 read from os-release."""
-        m_os_release.return_value = OS_RELEASE_ROCKY_8
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('rocky', '8.3', 'Green Obsidian'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_virtuozzo8_rhrelease(self, m_os_release, m_path_exists):
-        """Verify virtuozzo linux 8 read from redhat-release."""
-        m_os_release.return_value = REDHAT_RELEASE_VIRTUOZZO_8
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('virtuozzo', '8', 'Virtuozzo Linux'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_virtuozzo8_osrelease(self, m_os_release, m_path_exists):
-        """Verify virtuozzo linux 8 read from os-release."""
-        m_os_release.return_value = OS_RELEASE_VIRTUOZZO_8
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('virtuozzo', '8', 'Virtuozzo Linux'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_cloud8_rhrelease(self, m_os_release, m_path_exists):
-        """Verify cloudlinux 8 read from redhat-release."""
-        m_os_release.return_value = REDHAT_RELEASE_CLOUDLINUX_8
-        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('cloudlinux', '8.4', 'Valery Rozhdestvensky'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_cloud8_osrelease(self, m_os_release, m_path_exists):
-        """Verify cloudlinux 8 read from os-release."""
-        m_os_release.return_value = OS_RELEASE_CLOUDLINUX_8
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('cloudlinux', '8.4', 'Valery Rozhdestvensky'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_debian(self, m_os_release, m_path_exists):
-        """Verify we get the correct name and release name on Debian."""
-        m_os_release.return_value = OS_RELEASE_DEBIAN
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('debian', '9', 'stretch'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_openeuler(self, m_os_release, m_path_exists):
-        """Verify get the correct name and release name on Openeuler."""
-        m_os_release.return_value = OS_RELEASE_OPENEULER_20
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('openEuler', '20.03', 'LTS-SP2'), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_opensuse(self, m_os_release, m_path_exists):
-        """Verify we get the correct name and machine arch on openSUSE
-           prior to openSUSE Leap 15.
-        """
-        m_os_release.return_value = OS_RELEASE_OPENSUSE
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('opensuse', '42.3', platform.machine()), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_opensuse_l15(self, m_os_release, m_path_exists):
-        """Verify we get the correct name and machine arch on openSUSE
-           for openSUSE Leap 15.0 and later.
-        """
-        m_os_release.return_value = OS_RELEASE_OPENSUSE_L15
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(('opensuse-leap', '15.0', platform.machine()), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_opensuse_tw(self, m_os_release, m_path_exists):
-        """Verify we get the correct name and machine arch on openSUSE
-           for openSUSE Tumbleweed
-        """
-        m_os_release.return_value = OS_RELEASE_OPENSUSE_TW
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(
-            ('opensuse-tumbleweed', '20180920', platform.machine()), dist)
-
-    @mock.patch('cloudinit.util.load_file')
-    def test_get_linux_photon_os_release(self, m_os_release, m_path_exists):
-        """Verify we get the correct name and machine arch on PhotonOS"""
-        m_os_release.return_value = OS_RELEASE_PHOTON
-        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
-        dist = util.get_linux_distro()
-        self.assertEqual(
-            ('photon', '4.0', 'VMware Photon OS/Linux'), dist)
-
-    @mock.patch('platform.system')
-    @mock.patch('platform.dist', create=True)
-    def test_get_linux_distro_no_data(self, m_platform_dist,
-                                      m_platform_system, m_path_exists):
-        """Verify we get no information if os-release does not exist"""
-        m_platform_dist.return_value = ('', '', '')
-        m_platform_system.return_value = "Linux"
-        m_path_exists.return_value = 0
-        dist = util.get_linux_distro()
-        self.assertEqual(('', '', ''), dist)
-
-    @mock.patch('platform.system')
-    @mock.patch('platform.dist', create=True)
-    def test_get_linux_distro_no_impl(self, m_platform_dist,
-                                      m_platform_system, m_path_exists):
-        """Verify we get an empty tuple when no information exists and
-        Exceptions are not propagated"""
-        m_platform_dist.side_effect = Exception()
-        m_platform_system.return_value = "Linux"
-        m_path_exists.return_value = 0
-        dist = util.get_linux_distro()
-        self.assertEqual(('', '', ''), dist)
-
-    @mock.patch('platform.system')
-    @mock.patch('platform.dist', create=True)
-    def test_get_linux_distro_plat_data(self, m_platform_dist,
-                                        m_platform_system, m_path_exists):
-        """Verify we get the correct platform information"""
-        m_platform_dist.return_value = ('foo', '1.1', 'aarch64')
-        m_platform_system.return_value = "Linux"
-        m_path_exists.return_value = 0
-        dist = util.get_linux_distro()
-        self.assertEqual(('foo', '1.1', 'aarch64'), dist)
-
-
-class TestGetVariant:
-    @pytest.mark.parametrize('info, expected_variant', [
-        ({'system': 'Linux', 'dist': ('almalinux',)}, 'almalinux'),
-        ({'system': 'linux', 'dist': ('alpine',)}, 'alpine'),
-        ({'system': 'linux', 'dist': ('arch',)}, 'arch'),
-        ({'system': 'linux', 'dist': ('centos',)}, 'centos'),
-        ({'system': 'linux', 'dist': ('cloudlinux',)}, 'cloudlinux'),
-        ({'system': 'linux', 'dist': ('debian',)}, 'debian'),
-        ({'system': 'linux', 'dist': ('eurolinux',)}, 'eurolinux'),
-        ({'system': 'linux', 'dist': ('fedora',)}, 'fedora'),
-        ({'system': 'linux', 'dist': ('openEuler',)}, 'openeuler'),
-        ({'system': 'linux', 'dist': ('photon',)}, 'photon'),
-        ({'system': 'linux', 'dist': ('rhel',)}, 'rhel'),
-        ({'system': 'linux', 'dist': ('rocky',)}, 'rocky'),
-        ({'system': 'linux', 'dist': ('suse',)}, 'suse'),
-        ({'system': 'linux', 'dist': ('virtuozzo',)}, 'virtuozzo'),
-        ({'system': 'linux', 'dist': ('ubuntu',)}, 'ubuntu'),
-        ({'system': 'linux', 'dist': ('linuxmint',)}, 'ubuntu'),
-        ({'system': 'linux', 'dist': ('mint',)}, 'ubuntu'),
-        ({'system': 'linux', 'dist': ('redhat',)}, 'rhel'),
-        ({'system': 'linux', 'dist': ('opensuse',)}, 'suse'),
-        ({'system': 'linux', 'dist': ('opensuse-tumbleweed',)}, 'suse'),
-        ({'system': 'linux', 'dist': ('opensuse-leap',)}, 'suse'),
-        ({'system': 'linux', 'dist': ('sles',)}, 'suse'),
-        ({'system': 'linux', 'dist': ('sle_hpc',)}, 'suse'),
-        ({'system': 'linux', 'dist': ('my_distro',)}, 'linux'),
-        ({'system': 'Windows', 'dist': ('dontcare',)}, 'windows'),
-        ({'system': 'Darwin', 'dist': ('dontcare',)}, 'darwin'),
-        ({'system': 'Freebsd', 'dist': ('dontcare',)}, 'freebsd'),
-        ({'system': 'Netbsd', 'dist': ('dontcare',)}, 'netbsd'),
-        ({'system': 'Openbsd', 'dist': ('dontcare',)}, 'openbsd'),
-        ({'system': 'Dragonfly', 'dist': ('dontcare',)}, 'dragonfly'),
-    ])
-    def test_get_variant(self, info, expected_variant):
-        """Verify we get the correct variant name"""
-        assert util._get_variant(info) == expected_variant
-
-
-class TestJsonDumps(CiTestCase):
-    def test_is_str(self):
-        """json_dumps should return a string."""
-        self.assertTrue(isinstance(util.json_dumps({'abc': '123'}), str))
-
-    def test_utf8(self):
-        smiley = '\\ud83d\\ude03'
-        self.assertEqual(
-            {'smiley': smiley},
-            json.loads(util.json_dumps({'smiley': smiley})))
-
-    def test_non_utf8(self):
-        blob = b'\xba\x03Qx-#y\xea'
-        self.assertEqual(
-            {'blob': 'ci-b64:' + base64.b64encode(blob).decode('utf-8')},
-            json.loads(util.json_dumps({'blob': blob})))
-
-
-@mock.patch('os.path.exists')
-class TestIsLXD(CiTestCase):
-
-    def test_is_lxd_true_on_sock_device(self, m_exists):
-        """When lxd's /dev/lxd/sock exists, is_lxd returns true."""
-        m_exists.return_value = True
-        self.assertTrue(util.is_lxd())
-        m_exists.assert_called_once_with('/dev/lxd/sock')
-
-    def test_is_lxd_false_when_sock_device_absent(self, m_exists):
-        """When lxd's /dev/lxd/sock is absent, is_lxd returns false."""
-        m_exists.return_value = False
-        self.assertFalse(util.is_lxd())
-        m_exists.assert_called_once_with('/dev/lxd/sock')
-
-
-class TestReadCcFromCmdline:
-
-    @pytest.mark.parametrize(
-        "cmdline,expected_cfg",
-        [
-            # Return None if cmdline has no cc:<YAML>end_cc content.
-            (CiTestCase.random_string(), None),
-            # Return None if YAML content is empty string.
-            ('foo cc: end_cc bar', None),
-            # Return expected dictionary without trailing end_cc marker.
-            ('foo cc: ssh_pwauth: true', {'ssh_pwauth': True}),
-            # Return expected dictionary w escaped newline and no end_cc.
-            ('foo cc: ssh_pwauth: true\\n', {'ssh_pwauth': True}),
-            # Return expected dictionary of yaml between cc: and end_cc.
-            ('foo cc: ssh_pwauth: true end_cc bar', {'ssh_pwauth': True}),
-            # Return dict with list value w escaped newline, no end_cc.
-            (
-                'cc: ssh_import_id: [smoser, kirkland]\\n',
-                {'ssh_import_id': ['smoser', 'kirkland']}
-            ),
-            # Parse urlencoded brackets in yaml content.
-            (
-                'cc: ssh_import_id: %5Bsmoser, kirkland%5D end_cc',
-                {'ssh_import_id': ['smoser', 'kirkland']}
-            ),
-            # Parse complete urlencoded yaml content.
-            (
-                'cc: ssh_import_id%3A%20%5Buser1%2C%20user2%5D end_cc',
-                {'ssh_import_id': ['user1', 'user2']}
-            ),
-            # Parse nested dictionary in yaml content.
-            (
-                'cc: ntp: {enabled: true, ntp_client: myclient} end_cc',
-                {'ntp': {'enabled': True, 'ntp_client': 'myclient'}}
-            ),
-            # Parse single mapping value in yaml content.
-            ('cc: ssh_import_id: smoser end_cc', {'ssh_import_id': 'smoser'}),
-            # Parse multiline content with multiple mapping and nested lists.
-            (
-                ('cc: ssh_import_id: [smoser, bob]\\n'
-                 'runcmd: [ [ ls, -l ], echo hi ] end_cc'),
-                {'ssh_import_id': ['smoser', 'bob'],
-                 'runcmd': [['ls', '-l'], 'echo hi']}
-            ),
-            # Parse multiline encoded content w/ mappings and nested lists.
-            (
-                ('cc: ssh_import_id: %5Bsmoser, bob%5D\\n'
-                 'runcmd: [ [ ls, -l ], echo hi ] end_cc'),
-                {'ssh_import_id': ['smoser', 'bob'],
-                 'runcmd': [['ls', '-l'], 'echo hi']}
-            ),
-            # test encoded escaped newlines work.
-            #
-            # unquote(encoded_content)
-            # 'ssh_import_id: [smoser, bob]\\nruncmd: [ [ ls, -l ], echo hi ]'
-            (
-                ('cc: ' +
-                 ('ssh_import_id%3A%20%5Bsmoser%2C%20bob%5D%5Cn'
-                  'runcmd%3A%20%5B%20%5B%20ls%2C%20-l%20%5D%2C'
-                  '%20echo%20hi%20%5D') + ' end_cc'),
-                {'ssh_import_id': ['smoser', 'bob'],
-                 'runcmd': [['ls', '-l'], 'echo hi']}
-            ),
-            # test encoded newlines work.
-            #
-            # unquote(encoded_content)
-            # 'ssh_import_id: [smoser, bob]\nruncmd: [ [ ls, -l ], echo hi ]'
-            (
-                ("cc: " +
-                    ('ssh_import_id%3A%20%5Bsmoser%2C%20bob%5D%0A'
-                     'runcmd%3A%20%5B%20%5B%20ls%2C%20-l%20%5D%2C'
-                     '%20echo%20hi%20%5D') + ' end_cc'),
-                {'ssh_import_id': ['smoser', 'bob'],
-                 'runcmd': [['ls', '-l'], 'echo hi']}
-            ),
-            # Parse and merge multiple yaml content sections.
-            (
-                ('cc:ssh_import_id: [smoser, bob] end_cc '
-                 'cc: runcmd: [ [ ls, -l ] ] end_cc'),
-                {'ssh_import_id': ['smoser', 'bob'],
-                 'runcmd': [['ls', '-l']]}
-            ),
-            # Parse and merge multiple encoded yaml content sections.
-            (
-                ('cc:ssh_import_id%3A%20%5Bsmoser%5D end_cc '
-                 'cc:runcmd%3A%20%5B%20%5B%20ls%2C%20-l%20%5D%20%5D end_cc'),
-                {'ssh_import_id': ['smoser'], 'runcmd': [['ls', '-l']]}
-            ),
-        ]
-    )
-    def test_read_conf_from_cmdline_config(self, expected_cfg, cmdline):
-        assert expected_cfg == util.read_conf_from_cmdline(cmdline=cmdline)
-
-
-class TestMountCb:
-    """Tests for ``util.mount_cb``.
-
-    These tests consider the "unit" under test to be ``util.mount_cb`` and
-    ``util.unmounter``, which is only used by ``mount_cb``.
-
-    TODO: Test default mtype determination
-    TODO: Test the if/else branch that actually performs the mounting operation
-    """
-
-    @pytest.yield_fixture
-    def already_mounted_device_and_mountdict(self):
-        """Mock an already-mounted device, and yield (device, mount dict)"""
-        device = "/dev/fake0"
-        mountpoint = "/mnt/fake"
-        with mock.patch("cloudinit.util.subp.subp"):
-            with mock.patch("cloudinit.util.mounts") as m_mounts:
-                mounts = {device: {"mountpoint": mountpoint}}
-                m_mounts.return_value = mounts
-                yield device, mounts[device]
-
-    @pytest.fixture
-    def already_mounted_device(self, already_mounted_device_and_mountdict):
-        """already_mounted_device_and_mountdict, but return only the device"""
-        return already_mounted_device_and_mountdict[0]
-
-    @pytest.mark.parametrize(
-        "mtype,expected",
-        [
-            # While the filesystem is called iso9660, the mount type is cd9660
-            ("iso9660", "cd9660"),
-            # vfat is generally called "msdos" on BSD
-            ("vfat", "msdos"),
-            # judging from man pages, only FreeBSD has this alias
-            ("msdosfs", "msdos"),
-            # Test happy path
-            ("ufs", "ufs")
-        ],
-    )
-    @mock.patch("cloudinit.util.is_Linux", autospec=True)
-    @mock.patch("cloudinit.util.is_BSD", autospec=True)
-    @mock.patch("cloudinit.util.subp.subp")
-    @mock.patch("cloudinit.temp_utils.tempdir", autospec=True)
-    def test_normalize_mtype_on_bsd(
-        self, m_tmpdir, m_subp, m_is_BSD, m_is_Linux, mtype, expected
-    ):
-        m_is_BSD.return_value = True
-        m_is_Linux.return_value = False
-        m_tmpdir.return_value.__enter__ = mock.Mock(
-            autospec=True, return_value="/tmp/fake"
-        )
-        m_tmpdir.return_value.__exit__ = mock.Mock(
-            autospec=True, return_value=True
-        )
-        callback = mock.Mock(autospec=True)
-
-        util.mount_cb('/dev/fake0', callback, mtype=mtype)
-        assert mock.call(
-            ["mount", "-o", "ro", "-t", expected, "/dev/fake0", "/tmp/fake"],
-            update_env=None) in m_subp.call_args_list
-
-    @pytest.mark.parametrize("invalid_mtype", [int(0), float(0.0), dict()])
-    def test_typeerror_raised_for_invalid_mtype(self, invalid_mtype):
-        with pytest.raises(TypeError):
-            util.mount_cb(mock.Mock(), mock.Mock(), mtype=invalid_mtype)
-
-    @mock.patch("cloudinit.util.subp.subp")
-    def test_already_mounted_does_not_mount_or_umount_anything(
-        self, m_subp, already_mounted_device
-    ):
-        util.mount_cb(already_mounted_device, mock.Mock())
-
-        assert 0 == m_subp.call_count
-
-    @pytest.mark.parametrize("trailing_slash_in_mounts", ["/", ""])
-    def test_already_mounted_calls_callback(
-        self, trailing_slash_in_mounts, already_mounted_device_and_mountdict
-    ):
-        device, mount_dict = already_mounted_device_and_mountdict
-        mountpoint = mount_dict["mountpoint"]
-        mount_dict["mountpoint"] += trailing_slash_in_mounts
-
-        callback = mock.Mock()
-        util.mount_cb(device, callback)
-
-        # The mountpoint passed to callback should always have a trailing
-        # slash, regardless of the input
-        assert [mock.call(mountpoint + "/")] == callback.call_args_list
-
-    def test_already_mounted_calls_callback_with_data(
-        self, already_mounted_device
-    ):
-        callback = mock.Mock()
-        util.mount_cb(
-            already_mounted_device, callback, data=mock.sentinel.data
-        )
-
-        assert [
-            mock.call(mock.ANY, mock.sentinel.data)
-        ] == callback.call_args_list
-
-
-@mock.patch("cloudinit.util.write_file")
-class TestEnsureFile:
-    """Tests for ``cloudinit.util.ensure_file``."""
-
-    def test_parameters_passed_through(self, m_write_file):
-        """Test the parameters in the signature are passed to write_file."""
-        util.ensure_file(
-            mock.sentinel.path,
-            mode=mock.sentinel.mode,
-            preserve_mode=mock.sentinel.preserve_mode,
-        )
-
-        assert 1 == m_write_file.call_count
-        args, kwargs = m_write_file.call_args
-        assert (mock.sentinel.path,) == args
-        assert mock.sentinel.mode == kwargs["mode"]
-        assert mock.sentinel.preserve_mode == kwargs["preserve_mode"]
-
-    @pytest.mark.parametrize(
-        "kwarg,expected",
-        [
-            # Files should be world-readable by default
-            ("mode", 0o644),
-            # The previous behaviour of not preserving mode should be retained
-            ("preserve_mode", False),
-        ],
-    )
-    def test_defaults(self, m_write_file, kwarg, expected):
-        """Test that ensure_file defaults appropriately."""
-        util.ensure_file(mock.sentinel.path)
-
-        assert 1 == m_write_file.call_count
-        _args, kwargs = m_write_file.call_args
-        assert expected == kwargs[kwarg]
-
-    def test_static_parameters_are_passed(self, m_write_file):
-        """Test that the static write_files parameters are passed correctly."""
-        util.ensure_file(mock.sentinel.path)
-
-        assert 1 == m_write_file.call_count
-        _args, kwargs = m_write_file.call_args
-        assert "" == kwargs["content"]
-        assert "ab" == kwargs["omode"]
-
-
-@mock.patch("cloudinit.util.grp.getgrnam")
-@mock.patch("cloudinit.util.os.setgid")
-@mock.patch("cloudinit.util.os.umask")
-class TestRedirectOutputPreexecFn:
-    """This tests specifically the preexec_fn used in redirect_output."""
-
-    @pytest.fixture(params=["outfmt", "errfmt"])
-    def preexec_fn(self, request):
-        """A fixture to gather the preexec_fn used by redirect_output.
-
-        This enables simpler direct testing of it, and parameterises any tests
-        using it to cover both the stdout and stderr code paths.
-        """
-        test_string = "| piped output to invoke subprocess"
-        if request.param == "outfmt":
-            args = (test_string, None)
-        elif request.param == "errfmt":
-            args = (None, test_string)
-        with mock.patch("cloudinit.util.subprocess.Popen") as m_popen:
-            util.redirect_output(*args)
-
-        assert 1 == m_popen.call_count
-        _args, kwargs = m_popen.call_args
-        assert "preexec_fn" in kwargs, "preexec_fn not passed to Popen"
-        return kwargs["preexec_fn"]
-
-    def test_preexec_fn_sets_umask(
-        self, m_os_umask, _m_setgid, _m_getgrnam, preexec_fn
-    ):
-        """preexec_fn should set a mask that avoids world-readable files."""
-        preexec_fn()
-
-        assert [mock.call(0o037)] == m_os_umask.call_args_list
-
-    def test_preexec_fn_sets_group_id_if_adm_group_present(
-        self, _m_os_umask, m_setgid, m_getgrnam, preexec_fn
-    ):
-        """We should setgrp to adm if present, so files are owned by them."""
-        fake_group = mock.Mock(gr_gid=mock.sentinel.gr_gid)
-        m_getgrnam.return_value = fake_group
-
-        preexec_fn()
-
-        assert [mock.call("adm")] == m_getgrnam.call_args_list
-        assert [mock.call(mock.sentinel.gr_gid)] == m_setgid.call_args_list
-
-    def test_preexec_fn_handles_absent_adm_group_gracefully(
-        self, _m_os_umask, m_setgid, m_getgrnam, preexec_fn
-    ):
-        """We should handle an absent adm group gracefully."""
-        m_getgrnam.side_effect = KeyError("getgrnam(): name not found: 'adm'")
-
-        preexec_fn()
-
-        assert 0 == m_setgid.call_count
-
-# vi: ts=4 expandtab
diff --git a/doc/rtd/topics/testing.rst b/doc/rtd/topics/testing.rst
index d882e036..7a1e3eec 100644
--- a/doc/rtd/topics/testing.rst
+++ b/doc/rtd/topics/testing.rst
@@ -3,8 +3,7 @@ Testing
 *******
 
 cloud-init has both unit tests and integration tests. Unit tests can
-be found in-tree alongside the source code, as well as
-at ``tests/unittests``. Integration tests can be found at
+be found at ``tests/unittests``. Integration tests can be found at
 ``tests/integration_tests``. Documentation specifically for integration
 tests can be found on the :ref:`integration_tests` page, but
 the guidelines specified below apply to both types of tests.
@@ -36,6 +35,16 @@ Test Layout
     subclass (indirectly) from ``TestCase`` (e.g.
     `TestPrependBaseCommands`_)
 
+* Unit tests and integration tests are located under cloud-init/tests
+
+  * For consistency, unit test files should have a matching name and
+    directory location under `tests/unittests`
+
+  * For example: the expected test file for code in
+    `cloudinit/path/to/file.py` is
+    `tests/unittests/path/to/test_file.py`
+
+
 ``pytest`` Tests
 ----------------
 
diff --git a/setup.py b/setup.py
index 58fddf0f..100b07fe 100755
--- a/setup.py
+++ b/setup.py
@@ -291,7 +291,7 @@ setuptools.setup(
     author='Scott Moser',
     author_email='scott.moser@canonical.com',
     url='http://launchpad.net/cloud-init/',
-    packages=setuptools.find_packages(exclude=['tests.*', '*.tests', 'tests']),
+    packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
     scripts=['tools/cloud-init-per'],
     license='Dual-licensed under GPLv3 or Apache 2.0',
     data_files=data_files,
diff --git a/cloudinit/analyze/tests/test_boot.py b/tests/unittests/analyze/test_boot.py
index 6b3afb5e..fd878b44 100644
--- a/cloudinit/analyze/tests/test_boot.py
+++ b/tests/unittests/analyze/test_boot.py
@@ -1,6 +1,6 @@
 import os
 from cloudinit.analyze.__main__ import (analyze_boot, get_parser)
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 from cloudinit.analyze.show import dist_check_timestamp, SystemctlReader, \
     FAIL_CODE, CONTAINER_CODE
 
diff --git a/cloudinit/analyze/tests/test_dump.py b/tests/unittests/analyze/test_dump.py
index dac1efb6..e3683bbf 100644
--- a/cloudinit/analyze/tests/test_dump.py
+++ b/tests/unittests/analyze/test_dump.py
@@ -7,7 +7,7 @@ from cloudinit.analyze.dump import (
     dump_events, parse_ci_logline, parse_timestamp)
 from cloudinit.util import write_file
 from cloudinit.subp import which
-from cloudinit.tests.helpers import CiTestCase, mock, skipIf
+from tests.unittests.helpers import CiTestCase, mock, skipIf
 
 
 class TestParseTimestamp(CiTestCase):
diff --git a/cloudinit/cmd/devel/tests/__init__.py b/tests/unittests/cloudinit/__init__py
index e69de29b..e69de29b 100644
--- a/cloudinit/cmd/devel/tests/__init__.py
+++ b/tests/unittests/cloudinit/__init__py
diff --git a/cloudinit/cmd/tests/__init__.py b/tests/unittests/cmd/__init__.py
index e69de29b..e69de29b 100644
--- a/cloudinit/cmd/tests/__init__.py
+++ b/tests/unittests/cmd/__init__.py
diff --git a/cloudinit/distros/tests/__init__.py b/tests/unittests/cmd/devel/__init__.py
index e69de29b..e69de29b 100644
--- a/cloudinit/distros/tests/__init__.py
+++ b/tests/unittests/cmd/devel/__init__.py
diff --git a/cloudinit/cmd/devel/tests/test_logs.py b/tests/unittests/cmd/devel/test_logs.py
index ddfd58e1..18bdcdda 100644
--- a/cloudinit/cmd/devel/tests/test_logs.py
+++ b/tests/unittests/cmd/devel/test_logs.py
@@ -6,7 +6,7 @@ from io import StringIO
 
 from cloudinit.cmd.devel import logs
 from cloudinit.sources import INSTANCE_JSON_SENSITIVE_FILE
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     FilesystemMockingTestCase, mock, wrap_and_call)
 from cloudinit.subp import subp
 from cloudinit.util import ensure_dir, load_file, write_file
diff --git a/cloudinit/cmd/devel/tests/test_render.py b/tests/unittests/cmd/devel/test_render.py
index a7fcf2ce..c7ddca3d 100644
--- a/cloudinit/cmd/devel/tests/test_render.py
+++ b/tests/unittests/cmd/devel/test_render.py
@@ -7,7 +7,7 @@ from collections import namedtuple
 from cloudinit.cmd.devel import render
 from cloudinit.helpers import Paths
 from cloudinit.sources import INSTANCE_JSON_FILE, INSTANCE_JSON_SENSITIVE_FILE
-from cloudinit.tests.helpers import CiTestCase, mock, skipUnlessJinja
+from tests.unittests.helpers import CiTestCase, mock, skipUnlessJinja
 from cloudinit.util import ensure_dir, write_file
 
 
diff --git a/cloudinit/cmd/tests/test_clean.py b/tests/unittests/cmd/test_clean.py
index a848a810..81fc930e 100644
--- a/cloudinit/cmd/tests/test_clean.py
+++ b/tests/unittests/cmd/test_clean.py
@@ -2,7 +2,7 @@
 
 from cloudinit.cmd import clean
 from cloudinit.util import ensure_dir, sym_link, write_file
-from cloudinit.tests.helpers import CiTestCase, wrap_and_call, mock
+from tests.unittests.helpers import CiTestCase, wrap_and_call, mock
 from collections import namedtuple
 import os
 from io import StringIO
diff --git a/cloudinit/cmd/tests/test_cloud_id.py b/tests/unittests/cmd/test_cloud_id.py
index 3f3727fd..12fc80e8 100644
--- a/cloudinit/cmd/tests/test_cloud_id.py
+++ b/tests/unittests/cmd/test_cloud_id.py
@@ -8,7 +8,7 @@ from io import StringIO
 
 from cloudinit.cmd import cloud_id
 
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 
 class TestCloudId(CiTestCase):
diff --git a/cloudinit/cmd/tests/test_main.py b/tests/unittests/cmd/test_main.py
index 2e380848..e1ce682b 100644
--- a/cloudinit/cmd/tests/test_main.py
+++ b/tests/unittests/cmd/test_main.py
@@ -12,7 +12,7 @@ from cloudinit.cmd import main
 from cloudinit import safeyaml
 from cloudinit.util import (
     ensure_dir, load_file, write_file)
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     FilesystemMockingTestCase, wrap_and_call)
 
 mypaths = namedtuple('MyPaths', 'run_dir')
diff --git a/cloudinit/cmd/tests/test_query.py b/tests/unittests/cmd/test_query.py
index d96c3945..b3f1d98d 100644
--- a/cloudinit/cmd/tests/test_query.py
+++ b/tests/unittests/cmd/test_query.py
@@ -13,7 +13,7 @@ from cloudinit.cmd import query
 from cloudinit.helpers import Paths
 from cloudinit.sources import (
     REDACT_SENSITIVE_VALUE, INSTANCE_JSON_FILE, INSTANCE_JSON_SENSITIVE_FILE)
-from cloudinit.tests.helpers import mock
+from tests.unittests.helpers import mock
 
 from cloudinit.util import b64e, write_file
 
diff --git a/cloudinit/cmd/tests/test_status.py b/tests/unittests/cmd/test_status.py
index 1c9eec37..49eae043 100644
--- a/cloudinit/cmd/tests/test_status.py
+++ b/tests/unittests/cmd/test_status.py
@@ -8,7 +8,7 @@ from textwrap import dedent
 from cloudinit.atomic_helper import write_json
 from cloudinit.cmd import status
 from cloudinit.util import ensure_file
-from cloudinit.tests.helpers import CiTestCase, wrap_and_call, mock
+from tests.unittests.helpers import CiTestCase, wrap_and_call, mock
 
 mypaths = namedtuple('MyPaths', 'run_dir')
 myargs = namedtuple('MyArgs', 'long wait')
diff --git a/cloudinit/net/tests/__init__.py b/tests/unittests/config/__init__.py
index e69de29b..e69de29b 100644
--- a/cloudinit/net/tests/__init__.py
+++ b/tests/unittests/config/__init__.py
diff --git a/tests/unittests/test_handler/test_handler_apt_conf_v1.py b/tests/unittests/config/test_apt_conf_v1.py
index 6a4b03ee..98d99945 100644
--- a/tests/unittests/test_handler/test_handler_apt_conf_v1.py
+++ b/tests/unittests/config/test_apt_conf_v1.py
@@ -3,7 +3,7 @@
 from cloudinit.config import cc_apt_configure
 from cloudinit import util
 
-from cloudinit.tests.helpers import TestCase
+from tests.unittests.helpers import TestCase
 
 import copy
 import os
diff --git a/tests/unittests/test_handler/test_handler_apt_configure_sources_list_v1.py b/tests/unittests/config/test_apt_configure_sources_list_v1.py
index d69916f9..4aeaea24 100644
--- a/tests/unittests/test_handler/test_handler_apt_configure_sources_list_v1.py
+++ b/tests/unittests/config/test_apt_configure_sources_list_v1.py
@@ -17,7 +17,7 @@ from cloudinit.config import cc_apt_configure
 
 from cloudinit.distros.debian import Distro
 
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 from tests.unittests.util import get_cloud
 
 LOG = logging.getLogger(__name__)
diff --git a/tests/unittests/test_handler/test_handler_apt_configure_sources_list_v3.py b/tests/unittests/config/test_apt_configure_sources_list_v3.py
index cd6f9239..a8087bd1 100644
--- a/tests/unittests/test_handler/test_handler_apt_configure_sources_list_v3.py
+++ b/tests/unittests/config/test_apt_configure_sources_list_v3.py
@@ -15,7 +15,7 @@ from cloudinit import subp
 from cloudinit import util
 from cloudinit.config import cc_apt_configure
 from cloudinit.distros.debian import Distro
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 from tests.unittests.util import get_cloud
 
diff --git a/tests/unittests/test_handler/test_handler_apt_key.py b/tests/unittests/config/test_apt_key.py
index 00e5a38d..00e5a38d 100644
--- a/tests/unittests/test_handler/test_handler_apt_key.py
+++ b/tests/unittests/config/test_apt_key.py
diff --git a/tests/unittests/test_handler/test_handler_apt_source_v1.py b/tests/unittests/config/test_apt_source_v1.py
index 2357d699..684c2495 100644
--- a/tests/unittests/test_handler/test_handler_apt_source_v1.py
+++ b/tests/unittests/config/test_apt_source_v1.py
@@ -18,7 +18,7 @@ from cloudinit import gpg
 from cloudinit import subp
 from cloudinit import util
 
-from cloudinit.tests.helpers import TestCase
+from tests.unittests.helpers import TestCase
 
 EXPECTEDKEY = """-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1
diff --git a/tests/unittests/test_handler/test_handler_apt_source_v3.py b/tests/unittests/config/test_apt_source_v3.py
index 20289121..0b78037e 100644
--- a/tests/unittests/test_handler/test_handler_apt_source_v3.py
+++ b/tests/unittests/config/test_apt_source_v3.py
@@ -19,7 +19,7 @@ from cloudinit import gpg
 from cloudinit import subp
 from cloudinit import util
 from cloudinit.config import cc_apt_configure
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 from tests.unittests.util import get_cloud
 
diff --git a/tests/unittests/test_handler/test_handler_apk_configure.py b/tests/unittests/config/test_cc_apk_configure.py
index 8acc0b33..70139451 100644
--- a/tests/unittests/test_handler/test_handler_apk_configure.py
+++ b/tests/unittests/config/test_cc_apk_configure.py
@@ -11,7 +11,7 @@ import textwrap
 from cloudinit import (cloud, helpers, util)
 
 from cloudinit.config import cc_apk_configure
-from cloudinit.tests.helpers import (FilesystemMockingTestCase, mock)
+from tests.unittests.helpers import (FilesystemMockingTestCase, mock)
 
 REPO_FILE = "/etc/apk/repositories"
 DEFAULT_MIRROR_URL = "https://alpine.global.ssl.fastly.net/alpine"
diff --git a/cloudinit/config/tests/test_apt_pipelining.py b/tests/unittests/config/test_cc_apt_pipelining.py
index 2a6bb10b..d7589d35 100644
--- a/cloudinit/config/tests/test_apt_pipelining.py
+++ b/tests/unittests/config/test_cc_apt_pipelining.py
@@ -4,7 +4,7 @@
 
 import cloudinit.config.cc_apt_pipelining as cc_apt_pipelining
 
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 
 class TestAptPipelining(CiTestCase):
diff --git a/tests/unittests/test_handler/test_handler_bootcmd.py b/tests/unittests/config/test_cc_bootcmd.py
index 8cd3a5e1..6f38f12a 100644
--- a/tests/unittests/test_handler/test_handler_bootcmd.py
+++ b/tests/unittests/config/test_cc_bootcmd.py
@@ -4,7 +4,7 @@ import tempfile
 
 from cloudinit.config.cc_bootcmd import handle, schema
 from cloudinit import (subp, util)
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, mock, SchemaTestCaseMixin, skipUnlessJsonSchema)
 
 from tests.unittests.util import get_cloud
diff --git a/tests/unittests/test_handler/test_handler_ca_certs.py b/tests/unittests/config/test_cc_ca_certs.py
index 2a4ab49e..91b005d0 100644
--- a/tests/unittests/test_handler/test_handler_ca_certs.py
+++ b/tests/unittests/config/test_cc_ca_certs.py
@@ -11,7 +11,7 @@ from cloudinit.config import cc_ca_certs
 from cloudinit import helpers
 from cloudinit import subp
 from cloudinit import util
-from cloudinit.tests.helpers import TestCase
+from tests.unittests.helpers import TestCase
 
 from tests.unittests.util import get_cloud
 
diff --git a/tests/unittests/test_handler/test_handler_chef.py b/tests/unittests/config/test_cc_chef.py
index 0672cebc..060293c8 100644
--- a/tests/unittests/test_handler/test_handler_chef.py
+++ b/tests/unittests/config/test_cc_chef.py
@@ -8,7 +8,7 @@ import os
 from cloudinit.config import cc_chef
 from cloudinit import util
 
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     HttprettyTestCase, FilesystemMockingTestCase, mock, skipIf)
 
 from tests.unittests.util import get_cloud
diff --git a/tests/unittests/test_handler/test_handler_debug.py b/tests/unittests/config/test_cc_debug.py
index 41e9d9bd..174f772f 100644
--- a/tests/unittests/test_handler/test_handler_debug.py
+++ b/tests/unittests/config/test_cc_debug.py
@@ -7,7 +7,7 @@ import tempfile
 
 from cloudinit import util
 from cloudinit.config import cc_debug
-from cloudinit.tests.helpers import (FilesystemMockingTestCase, mock)
+from tests.unittests.helpers import (FilesystemMockingTestCase, mock)
 
 from tests.unittests.util import get_cloud
 
diff --git a/cloudinit/config/tests/test_disable_ec2_metadata.py b/tests/unittests/config/test_cc_disable_ec2_metadata.py
index b00f2083..7a794845 100644
--- a/cloudinit/config/tests/test_disable_ec2_metadata.py
+++ b/tests/unittests/config/test_cc_disable_ec2_metadata.py
@@ -4,7 +4,7 @@
 
 import cloudinit.config.cc_disable_ec2_metadata as ec2_meta
 
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 import logging
 
diff --git a/tests/unittests/test_handler/test_handler_disk_setup.py b/tests/unittests/config/test_cc_disk_setup.py
index 4f4a57fa..fa565559 100644
--- a/tests/unittests/test_handler/test_handler_disk_setup.py
+++ b/tests/unittests/config/test_cc_disk_setup.py
@@ -3,7 +3,7 @@
 import random
 
 from cloudinit.config import cc_disk_setup
-from cloudinit.tests.helpers import CiTestCase, ExitStack, mock, TestCase
+from tests.unittests.helpers import CiTestCase, ExitStack, mock, TestCase
 
 
 class TestIsDiskUsed(TestCase):
diff --git a/cloudinit/config/tests/test_final_message.py b/tests/unittests/config/test_cc_final_message.py
index 46ba99b2..46ba99b2 100644
--- a/cloudinit/config/tests/test_final_message.py
+++ b/tests/unittests/config/test_cc_final_message.py
diff --git a/tests/unittests/test_handler/test_handler_growpart.py b/tests/unittests/config/test_cc_growpart.py
index b7d5d7ba..b007f24f 100644
--- a/tests/unittests/test_handler/test_handler_growpart.py
+++ b/tests/unittests/config/test_cc_growpart.py
@@ -5,7 +5,7 @@ from cloudinit.config import cc_growpart
 from cloudinit import subp
 from cloudinit import temp_utils
 
-from cloudinit.tests.helpers import TestCase
+from tests.unittests.helpers import TestCase
 
 import errno
 import logging
diff --git a/cloudinit/config/tests/test_grub_dpkg.py b/tests/unittests/config/test_cc_grub_dpkg.py
index 99c05bb5..99c05bb5 100644
--- a/cloudinit/config/tests/test_grub_dpkg.py
+++ b/tests/unittests/config/test_cc_grub_dpkg.py
diff --git a/tests/unittests/test_handler/test_handler_install_hotplug.py b/tests/unittests/config/test_cc_install_hotplug.py
index 5d6b1e77..5d6b1e77 100644
--- a/tests/unittests/test_handler/test_handler_install_hotplug.py
+++ b/tests/unittests/config/test_cc_install_hotplug.py
diff --git a/cloudinit/config/tests/test_keys_to_console.py b/tests/unittests/config/test_cc_keys_to_console.py
index 4083fc54..4083fc54 100644
--- a/cloudinit/config/tests/test_keys_to_console.py
+++ b/tests/unittests/config/test_cc_keys_to_console.py
diff --git a/tests/unittests/test_handler/test_handler_landscape.py b/tests/unittests/config/test_cc_landscape.py
index 1cc73ea2..07b3f899 100644
--- a/tests/unittests/test_handler/test_handler_landscape.py
+++ b/tests/unittests/config/test_cc_landscape.py
@@ -4,7 +4,7 @@ from configobj import ConfigObj
 
 from cloudinit.config import cc_landscape
 from cloudinit import util
-from cloudinit.tests.helpers import (FilesystemMockingTestCase, mock,
+from tests.unittests.helpers import (FilesystemMockingTestCase, mock,
                                      wrap_and_call)
 
 from tests.unittests.util import get_cloud
diff --git a/tests/unittests/test_handler/test_handler_locale.py b/tests/unittests/config/test_cc_locale.py
index 3c17927e..6cd95a29 100644
--- a/tests/unittests/test_handler/test_handler_locale.py
+++ b/tests/unittests/config/test_cc_locale.py
@@ -13,7 +13,7 @@ from unittest import mock
 
 from cloudinit import util
 from cloudinit.config import cc_locale
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 from tests.unittests.util import get_cloud
 
diff --git a/tests/unittests/test_handler/test_handler_lxd.py b/tests/unittests/config/test_cc_lxd.py
index ea8b6e90..887987c0 100644
--- a/tests/unittests/test_handler/test_handler_lxd.py
+++ b/tests/unittests/config/test_cc_lxd.py
@@ -2,7 +2,7 @@
 from unittest import mock
 
 from cloudinit.config import cc_lxd
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 from tests.unittests.util import get_cloud
 
diff --git a/tests/unittests/test_handler/test_handler_mcollective.py b/tests/unittests/config/test_cc_mcollective.py
index 9cda6fbe..fff777b6 100644
--- a/tests/unittests/test_handler/test_handler_mcollective.py
+++ b/tests/unittests/config/test_cc_mcollective.py
@@ -8,7 +8,7 @@ from io import BytesIO
 
 from cloudinit import (util)
 from cloudinit.config import cc_mcollective
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 from tests.unittests.util import get_cloud
 
diff --git a/tests/unittests/test_handler/test_handler_mounts.py b/tests/unittests/config/test_cc_mounts.py
index 69e8b30d..fc65f108 100644
--- a/tests/unittests/test_handler/test_handler_mounts.py
+++ b/tests/unittests/config/test_cc_mounts.py
@@ -1,11 +1,15 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
+import pytest
 import os.path
 from unittest import mock
 
+from tests.unittests import helpers as test_helpers
 from cloudinit.config import cc_mounts
+from cloudinit.config.cc_mounts import create_swapfile
+from cloudinit.subp import ProcessExecutionError
 
-from cloudinit.tests import helpers as test_helpers
+M_PATH = 'cloudinit.config.cc_mounts.'
 
 
 class TestSanitizeDevname(test_helpers.FilesystemMockingTestCase):
@@ -403,4 +407,55 @@ class TestFstabHandling(test_helpers.FilesystemMockingTestCase):
             mock.call(['mount', '-a']),
             mock.call(['systemctl', 'daemon-reload'])])
 
+
+class TestCreateSwapfile:
+
+    @pytest.mark.parametrize('fstype', ('xfs', 'btrfs', 'ext4', 'other'))
+    @mock.patch(M_PATH + 'util.get_mount_info')
+    @mock.patch(M_PATH + 'subp.subp')
+    def test_happy_path(self, m_subp, m_get_mount_info, fstype, tmpdir):
+        swap_file = tmpdir.join("swap-file")
+        fname = str(swap_file)
+
+        # Some of the calls to subp.subp should create the swap file; this
+        # roughly approximates that
+        m_subp.side_effect = lambda *args, **kwargs: swap_file.write('')
+
+        m_get_mount_info.return_value = (mock.ANY, fstype)
+
+        create_swapfile(fname, '')
+        assert mock.call(['mkswap', fname]) in m_subp.call_args_list
+
+    @mock.patch(M_PATH + "util.get_mount_info")
+    @mock.patch(M_PATH + "subp.subp")
+    def test_fallback_from_fallocate_to_dd(
+        self, m_subp, m_get_mount_info, caplog, tmpdir
+    ):
+        swap_file = tmpdir.join("swap-file")
+        fname = str(swap_file)
+
+        def subp_side_effect(cmd, *args, **kwargs):
+            # Mock fallocate failing, to initiate fallback
+            if cmd[0] == "fallocate":
+                raise ProcessExecutionError()
+
+        m_subp.side_effect = subp_side_effect
+        # Use ext4 so both fallocate and dd are valid swap creation methods
+        m_get_mount_info.return_value = (mock.ANY, "ext4")
+
+        create_swapfile(fname, "")
+
+        cmds = [args[0][0] for args, _kwargs in m_subp.call_args_list]
+        assert "fallocate" in cmds, "fallocate was not called"
+        assert "dd" in cmds, "fallocate failure did not fallback to dd"
+
+        assert cmds.index("dd") > cmds.index(
+            "fallocate"
+        ), "dd ran before fallocate"
+
+        assert mock.call(["mkswap", fname]) in m_subp.call_args_list
+
+        msg = "fallocate swap creation failed, will attempt with dd"
+        assert msg in caplog.text
+
 # vi: ts=4 expandtab
diff --git a/tests/unittests/test_handler/test_handler_ntp.py b/tests/unittests/config/test_cc_ntp.py
index b34a18cb..3426533a 100644
--- a/tests/unittests/test_handler/test_handler_ntp.py
+++ b/tests/unittests/config/test_cc_ntp.py
@@ -7,7 +7,7 @@ from os.path import dirname
 
 from cloudinit import (helpers, util)
 from cloudinit.config import cc_ntp
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, FilesystemMockingTestCase, mock, skipUnlessJsonSchema)
 
 from tests.unittests.util import get_cloud
diff --git a/tests/unittests/test_handler/test_handler_power_state.py b/tests/unittests/config/test_cc_power_state_change.py
index 4ac49424..e699f424 100644
--- a/tests/unittests/test_handler/test_handler_power_state.py
+++ b/tests/unittests/config/test_cc_power_state_change.py
@@ -7,8 +7,8 @@ from cloudinit.config import cc_power_state_change as psc
 from cloudinit import distros
 from cloudinit import helpers
 
-from cloudinit.tests import helpers as t_help
-from cloudinit.tests.helpers import mock
+from tests.unittests import helpers as t_help
+from tests.unittests.helpers import mock
 
 
 class TestLoadPowerState(t_help.TestCase):
diff --git a/tests/unittests/test_handler/test_handler_puppet.py b/tests/unittests/config/test_cc_puppet.py
index 8d99f535..1f67dc4c 100644
--- a/tests/unittests/test_handler/test_handler_puppet.py
+++ b/tests/unittests/config/test_cc_puppet.py
@@ -4,7 +4,7 @@ import textwrap
 
 from cloudinit.config import cc_puppet
 from cloudinit import util
-from cloudinit.tests.helpers import CiTestCase, HttprettyTestCase, mock
+from tests.unittests.helpers import CiTestCase, HttprettyTestCase, mock
 
 from tests.unittests.util import get_cloud
 
diff --git a/tests/unittests/test_handler/test_handler_refresh_rmc_and_interface.py b/tests/unittests/config/test_cc_refresh_rmc_and_interface.py
index e13b7793..522de23d 100644
--- a/tests/unittests/test_handler/test_handler_refresh_rmc_and_interface.py
+++ b/tests/unittests/config/test_cc_refresh_rmc_and_interface.py
@@ -2,8 +2,8 @@ from cloudinit.config import cc_refresh_rmc_and_interface as ccrmci
 
 from cloudinit import util
 
-from cloudinit.tests import helpers as t_help
-from cloudinit.tests.helpers import mock
+from tests.unittests import helpers as t_help
+from tests.unittests.helpers import mock
 
 from textwrap import dedent
 import logging
diff --git a/tests/unittests/test_handler/test_handler_resizefs.py b/tests/unittests/config/test_cc_resizefs.py
index 28d55072..1f9e24da 100644
--- a/tests/unittests/test_handler/test_handler_resizefs.py
+++ b/tests/unittests/config/test_cc_resizefs.py
@@ -8,7 +8,7 @@ from collections import namedtuple
 import logging
 
 from cloudinit.subp import ProcessExecutionError
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, mock, skipUnlessJsonSchema, util, wrap_and_call)
 
 
diff --git a/tests/unittests/test_handler/test_handler_resolv_conf.py b/tests/unittests/config/test_cc_resolv_conf.py
index 96139001..0aa90a23 100644
--- a/tests/unittests/test_handler/test_handler_resolv_conf.py
+++ b/tests/unittests/config/test_cc_resolv_conf.py
@@ -1,22 +1,30 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-from cloudinit.config import cc_resolv_conf
+import logging
+import os
+import shutil
+import tempfile
+import pytest
+from copy import deepcopy
+from unittest import mock
 
 from cloudinit import cloud
 from cloudinit import distros
 from cloudinit import helpers
 from cloudinit import util
-from copy import deepcopy
 
-from cloudinit.tests import helpers as t_help
-
-import logging
-import os
-import shutil
-import tempfile
-from unittest import mock
+from tests.unittests import helpers as t_help
+from tests.unittests.util import MockDistro
+from cloudinit.config import cc_resolv_conf
+from cloudinit.config.cc_resolv_conf import generate_resolv_conf
 
 LOG = logging.getLogger(__name__)
+EXPECTED_HEADER = """\
+# Your system has been configured with 'manage-resolv-conf' set to true.
+# As a result, cloud-init has written this file with configuration data
+# that it has been provided. Cloud-init, by default, will write this file
+# a single time (PER_ONCE).
+#\n\n"""
 
 
 class TestResolvConf(t_help.FilesystemMockingTestCase):
@@ -102,4 +110,84 @@ class TestResolvConf(t_help.FilesystemMockingTestCase):
             mock.call(mock.ANY, '/etc/resolv.conf', mock.ANY)
         ] not in m_render_to_file.call_args_list
 
+
+class TestGenerateResolvConf:
+
+    dist = MockDistro()
+    tmpl_fn = "templates/resolv.conf.tmpl"
+
+    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
+    def test_dist_resolv_conf_fn(self, m_render_to_file):
+        self.dist.resolve_conf_fn = "/tmp/resolv-test.conf"
+        generate_resolv_conf(self.tmpl_fn,
+                             mock.MagicMock(),
+                             self.dist.resolve_conf_fn)
+
+        assert [
+            mock.call(mock.ANY, self.dist.resolve_conf_fn, mock.ANY)
+        ] == m_render_to_file.call_args_list
+
+    @mock.patch("cloudinit.config.cc_resolv_conf.templater.render_to_file")
+    def test_target_fname_is_used_if_passed(self, m_render_to_file):
+        path = "/use/this/path"
+        generate_resolv_conf(self.tmpl_fn, mock.MagicMock(), path)
+
+        assert [
+            mock.call(mock.ANY, path, mock.ANY)
+        ] == m_render_to_file.call_args_list
+
+    # Patch in templater so we can assert on the actual generated content
+    @mock.patch("cloudinit.templater.util.write_file")
+    # Parameterise with the value to be passed to generate_resolv_conf as the
+    # params parameter, and the expected line after the header as
+    # expected_extra_line.
+    @pytest.mark.parametrize(
+        "params,expected_extra_line",
+        [
+            # No options
+            ({}, None),
+            # Just a true flag
+            ({"options": {"foo": True}}, "options foo"),
+            # Just a false flag
+            ({"options": {"foo": False}}, None),
+            # Just an option
+            ({"options": {"foo": "some_value"}}, "options foo:some_value"),
+            # A true flag and an option
+            (
+                {"options": {"foo": "some_value", "bar": True}},
+                "options bar foo:some_value",
+            ),
+            # Two options
+            (
+                {"options": {"foo": "some_value", "bar": "other_value"}},
+                "options bar:other_value foo:some_value",
+            ),
+            # Everything
+            (
+                {
+                    "options": {
+                        "foo": "some_value",
+                        "bar": "other_value",
+                        "baz": False,
+                        "spam": True,
+                    }
+                },
+                "options spam bar:other_value foo:some_value",
+            ),
+        ],
+    )
+    def test_flags_and_options(
+        self, m_write_file, params, expected_extra_line
+    ):
+        target_fn = "/etc/resolv.conf"
+        generate_resolv_conf(self.tmpl_fn, params, target_fn)
+
+        expected_content = EXPECTED_HEADER
+        if expected_extra_line is not None:
+            # If we have any extra lines, expect a trailing newline
+            expected_content += "\n".join([expected_extra_line, ""])
+        assert [
+            mock.call(mock.ANY, expected_content, mode=mock.ANY)
+        ] == m_write_file.call_args_list
+
 # vi: ts=4 expandtab
diff --git a/tests/unittests/test_rh_subscription.py b/tests/unittests/config/test_cc_rh_subscription.py
index 53d3cd5a..bd7ebc98 100644
--- a/tests/unittests/test_rh_subscription.py
+++ b/tests/unittests/config/test_cc_rh_subscription.py
@@ -8,7 +8,7 @@ import logging
 from cloudinit.config import cc_rh_subscription
 from cloudinit import subp
 
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 SUBMGR = cc_rh_subscription.SubscriptionManager
 SUB_MAN_CLI = 'cloudinit.config.cc_rh_subscription._sub_man_cli'
diff --git a/tests/unittests/test_handler/test_handler_rsyslog.py b/tests/unittests/config/test_cc_rsyslog.py
index 8c8e2838..bc147dac 100644
--- a/tests/unittests/test_handler/test_handler_rsyslog.py
+++ b/tests/unittests/config/test_cc_rsyslog.py
@@ -9,7 +9,7 @@ from cloudinit.config.cc_rsyslog import (
     parse_remotes_line, remotes_to_rsyslog_cfg)
 from cloudinit import util
 
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 
 class TestLoadConfig(t_help.TestCase):
diff --git a/tests/unittests/test_handler/test_handler_runcmd.py b/tests/unittests/config/test_cc_runcmd.py
index 672e8093..01de6af0 100644
--- a/tests/unittests/test_handler/test_handler_runcmd.py
+++ b/tests/unittests/config/test_cc_runcmd.py
@@ -6,7 +6,7 @@ from unittest.mock import patch
 
 from cloudinit.config.cc_runcmd import handle, schema
 from cloudinit import (helpers, subp, util)
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, FilesystemMockingTestCase, SchemaTestCaseMixin,
     skipUnlessJsonSchema)
 
diff --git a/tests/unittests/test_handler/test_handler_seed_random.py b/tests/unittests/config/test_cc_seed_random.py
index 2ab153d2..cfd67dce 100644
--- a/tests/unittests/test_handler/test_handler_seed_random.py
+++ b/tests/unittests/config/test_cc_seed_random.py
@@ -15,7 +15,7 @@ from io import BytesIO
 from cloudinit import subp
 from cloudinit import util
 from cloudinit.config import cc_seed_random
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 from tests.unittests.util import get_cloud
 
diff --git a/tests/unittests/test_handler/test_handler_set_hostname.py b/tests/unittests/config/test_cc_set_hostname.py
index 1a524c7d..b9a783a7 100644
--- a/tests/unittests/test_handler/test_handler_set_hostname.py
+++ b/tests/unittests/config/test_cc_set_hostname.py
@@ -7,7 +7,7 @@ from cloudinit import distros
 from cloudinit import helpers
 from cloudinit import util
 
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 from configobj import ConfigObj
 import logging
diff --git a/cloudinit/config/tests/test_set_passwords.py b/tests/unittests/config/test_cc_set_passwords.py
index 2a27f72f..9bcd0439 100644
--- a/cloudinit/config/tests/test_set_passwords.py
+++ b/tests/unittests/config/test_cc_set_passwords.py
@@ -3,7 +3,7 @@
 from unittest import mock
 
 from cloudinit.config import cc_set_passwords as setpass
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 from cloudinit import util
 
 MODPATH = "cloudinit.config.cc_set_passwords."
@@ -79,8 +79,7 @@ class TestSetPasswordsHandle(CiTestCase):
             'ssh_pwauth=None\n',
             self.logs.getvalue())
 
-    @mock.patch(MODPATH + "subp.subp")
-    def test_handle_on_chpasswd_list_parses_common_hashes(self, m_subp):
+    def test_handle_on_chpasswd_list_parses_common_hashes(self):
         """handle parses command password hashes."""
         cloud = self.tmp_cloud(distro='ubuntu')
         valid_hashed_pwds = [
@@ -89,7 +88,7 @@ class TestSetPasswordsHandle(CiTestCase):
             'ubuntu:$6$5hOurLPO$naywm3Ce0UlmZg9gG2Fl9acWCVEoakMMC7dR52q'
             'SDexZbrN9z8yHxhUM2b.sxpguSwOlbOQSW/HpXazGGx3oo1']
         cfg = {'chpasswd': {'list': valid_hashed_pwds}}
-        with mock.patch(MODPATH + 'subp.subp') as m_subp:
+        with mock.patch.object(setpass, 'chpasswd') as chpasswd:
             setpass.handle(
                 'IGNORED', cfg=cfg, cloud=cloud, log=self.logger, args=[])
         self.assertIn(
@@ -98,10 +97,9 @@ class TestSetPasswordsHandle(CiTestCase):
         self.assertIn(
             "DEBUG: Setting hashed password for ['root', 'ubuntu']",
             self.logs.getvalue())
-        self.assertEqual(
-            [mock.call(['chpasswd', '-e'],
-             '\n'.join(valid_hashed_pwds) + '\n')],
-            m_subp.call_args_list)
+        valid = '\n'.join(valid_hashed_pwds) + '\n'
+        called = chpasswd.call_args[0][1]
+        self.assertEqual(valid, called)
 
     @mock.patch(MODPATH + "util.is_BSD")
     @mock.patch(MODPATH + "subp.subp")
@@ -131,22 +129,18 @@ class TestSetPasswordsHandle(CiTestCase):
             'root:R',
             'ubuntu:RANDOM']
         cfg = {'chpasswd': {'expire': 'false', 'list': valid_random_pwds}}
-        with mock.patch(MODPATH + 'subp.subp') as m_subp:
+        with mock.patch.object(setpass, 'chpasswd') as chpasswd:
             setpass.handle(
                 'IGNORED', cfg=cfg, cloud=cloud, log=self.logger, args=[])
         self.assertIn(
             'DEBUG: Handling input for chpasswd as list.',
             self.logs.getvalue())
-
-        self.assertEqual(1, m_subp.call_count)
-        args, _kwargs = m_subp.call_args
-        self.assertEqual(["chpasswd"], args[0])
-
-        stdin = args[1]
+        self.assertEqual(1, chpasswd.call_count)
+        passwords, _ = chpasswd.call_args
         user_pass = {
             user: password
             for user, password
-            in (line.split(":") for line in stdin.splitlines())
+            in (line.split(":") for line in passwords[1].splitlines())
         }
 
         self.assertEqual(1, m_multi_log.call_count)
diff --git a/cloudinit/config/tests/test_snap.py b/tests/unittests/config/test_cc_snap.py
index 6d4c014a..e8113eca 100644
--- a/cloudinit/config/tests/test_snap.py
+++ b/tests/unittests/config/test_cc_snap.py
@@ -8,7 +8,7 @@ from cloudinit.config.cc_snap import (
     run_commands, schema)
 from cloudinit.config.schema import validate_cloudconfig_schema
 from cloudinit import util
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, SchemaTestCaseMixin, mock, wrap_and_call, skipUnlessJsonSchema)
 
 
diff --git a/tests/unittests/test_handler/test_handler_spacewalk.py b/tests/unittests/config/test_cc_spacewalk.py
index 26f7648f..96efccf0 100644
--- a/tests/unittests/test_handler/test_handler_spacewalk.py
+++ b/tests/unittests/config/test_cc_spacewalk.py
@@ -3,7 +3,7 @@
 from cloudinit.config import cc_spacewalk
 from cloudinit import subp
 
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 
 import logging
 from unittest import mock
diff --git a/cloudinit/config/tests/test_ssh.py b/tests/unittests/config/test_cc_ssh.py
index 87ccdb60..ba179bbf 100644
--- a/cloudinit/config/tests/test_ssh.py
+++ b/tests/unittests/config/test_cc_ssh.py
@@ -4,7 +4,7 @@ import os.path
 
 from cloudinit.config import cc_ssh
 from cloudinit import ssh_util
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 import logging
 
 LOG = logging.getLogger(__name__)
diff --git a/tests/unittests/test_handler/test_handler_timezone.py b/tests/unittests/config/test_cc_timezone.py
index 77cdb0c2..fb6aab5f 100644
--- a/tests/unittests/test_handler/test_handler_timezone.py
+++ b/tests/unittests/config/test_cc_timezone.py
@@ -15,7 +15,7 @@ import tempfile
 from configobj import ConfigObj
 from io import BytesIO
 
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 from tests.unittests.util import get_cloud
 
diff --git a/cloudinit/config/tests/test_ubuntu_advantage.py b/tests/unittests/config/test_cc_ubuntu_advantage.py
index db7fb726..8d0c9665 100644
--- a/cloudinit/config/tests/test_ubuntu_advantage.py
+++ b/tests/unittests/config/test_cc_ubuntu_advantage.py
@@ -4,7 +4,7 @@ from cloudinit.config.cc_ubuntu_advantage import (
     configure_ua, handle, maybe_install_ua_tools, schema)
 from cloudinit.config.schema import validate_cloudconfig_schema
 from cloudinit import subp
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, mock, SchemaTestCaseMixin, skipUnlessJsonSchema)
 
 
diff --git a/cloudinit/config/tests/test_ubuntu_drivers.py b/tests/unittests/config/test_cc_ubuntu_drivers.py
index 504ba356..d341fbfd 100644
--- a/cloudinit/config/tests/test_ubuntu_drivers.py
+++ b/tests/unittests/config/test_cc_ubuntu_drivers.py
@@ -3,7 +3,7 @@
 import copy
 import os
 
-from cloudinit.tests.helpers import CiTestCase, skipUnlessJsonSchema, mock
+from tests.unittests.helpers import CiTestCase, skipUnlessJsonSchema, mock
 from cloudinit.config.schema import (
     SchemaValidationError, validate_cloudconfig_schema)
 from cloudinit.config import cc_ubuntu_drivers as drivers
diff --git a/tests/unittests/test_handler/test_handler_etc_hosts.py b/tests/unittests/config/test_cc_update_etc_hosts.py
index e3778b11..77a7f78f 100644
--- a/tests/unittests/test_handler/test_handler_etc_hosts.py
+++ b/tests/unittests/config/test_cc_update_etc_hosts.py
@@ -7,7 +7,7 @@ from cloudinit import distros
 from cloudinit import helpers
 from cloudinit import util
 
-from cloudinit.tests import helpers as t_help
+from tests.unittests import helpers as t_help
 
 import logging
 import os
diff --git a/cloudinit/config/tests/test_users_groups.py b/tests/unittests/config/test_cc_users_groups.py
index df89ddb3..4ef844cb 100644
--- a/cloudinit/config/tests/test_users_groups.py
+++ b/tests/unittests/config/test_cc_users_groups.py
@@ -2,7 +2,7 @@
 
 
 from cloudinit.config import cc_users_groups
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 MODPATH = "cloudinit.config.cc_users_groups"
 
diff --git a/tests/unittests/test_handler/test_handler_write_files.py b/tests/unittests/config/test_cc_write_files.py
index 0af92805..99248f74 100644
--- a/tests/unittests/test_handler/test_handler_write_files.py
+++ b/tests/unittests/config/test_cc_write_files.py
@@ -12,7 +12,7 @@ from cloudinit.config.cc_write_files import (
 from cloudinit import log as logging
 from cloudinit import util
 
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, FilesystemMockingTestCase, mock, skipUnlessJsonSchema)
 
 LOG = logging.getLogger(__name__)
diff --git a/tests/unittests/test_handler/test_handler_write_files_deferred.py b/tests/unittests/config/test_cc_write_files_deferred.py
index 57b6934a..d33d250a 100644
--- a/tests/unittests/test_handler/test_handler_write_files_deferred.py
+++ b/tests/unittests/config/test_cc_write_files_deferred.py
@@ -4,11 +4,11 @@ import tempfile
 import shutil
 
 from cloudinit.config.cc_write_files_deferred import (handle)
-from .test_handler_write_files import (VALID_SCHEMA)
+from .test_cc_write_files import (VALID_SCHEMA)
 from cloudinit import log as logging
 from cloudinit import util
 
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, FilesystemMockingTestCase, mock, skipUnlessJsonSchema)
 
 LOG = logging.getLogger(__name__)
diff --git a/tests/unittests/test_handler/test_handler_yum_add_repo.py b/tests/unittests/config/test_cc_yum_add_repo.py
index 7c61bbf9..2f11b96a 100644
--- a/tests/unittests/test_handler/test_handler_yum_add_repo.py
+++ b/tests/unittests/config/test_cc_yum_add_repo.py
@@ -7,7 +7,7 @@ import tempfile
 
 from cloudinit import util
 from cloudinit.config import cc_yum_add_repo
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tests/unittests/test_handler/test_handler_zypper_add_repo.py b/tests/unittests/config/test_cc_zypper_add_repo.py
index 0fb1de1a..4af04bee 100644
--- a/tests/unittests/test_handler/test_handler_zypper_add_repo.py
+++ b/tests/unittests/config/test_cc_zypper_add_repo.py
@@ -7,8 +7,8 @@ import os
 
 from cloudinit import util
 from cloudinit.config import cc_zypper_add_repo
-from cloudinit.tests import helpers
-from cloudinit.tests.helpers import mock
+from tests.unittests import helpers
+from tests.unittests.helpers import mock
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tests/unittests/test_handler/test_schema.py b/tests/unittests/config/test_schema.py
index 1dae223d..b01f5eea 100644
--- a/tests/unittests/test_handler/test_schema.py
+++ b/tests/unittests/config/test_schema.py
@@ -6,7 +6,7 @@ from cloudinit.config.schema import (
     validate_cloudconfig_schema, main)
 from cloudinit.util import write_file
 
-from cloudinit.tests.helpers import CiTestCase, mock, skipUnlessJsonSchema
+from tests.unittests.helpers import CiTestCase, mock, skipUnlessJsonSchema
 
 from copy import copy
 import itertools
diff --git a/tests/unittests/test_distros/__init__.py b/tests/unittests/distros/__init__.py
index 5394aa56..5394aa56 100644
--- a/tests/unittests/test_distros/__init__.py
+++ b/tests/unittests/distros/__init__.py
diff --git a/tests/unittests/test_distros/test_arch.py b/tests/unittests/distros/test_arch.py
index a95ba3b5..590ba00e 100644
--- a/tests/unittests/test_distros/test_arch.py
+++ b/tests/unittests/distros/test_arch.py
@@ -3,7 +3,7 @@
 from cloudinit.distros.arch import _render_network
 from cloudinit import util
 
-from cloudinit.tests.helpers import (CiTestCase, dir2dict)
+from tests.unittests.helpers import (CiTestCase, dir2dict)
 
 from . import _get_distro
 
diff --git a/tests/unittests/test_distros/test_bsd_utils.py b/tests/unittests/distros/test_bsd_utils.py
index 3a68f2a9..55686dc9 100644
--- a/tests/unittests/test_distros/test_bsd_utils.py
+++ b/tests/unittests/distros/test_bsd_utils.py
@@ -2,7 +2,7 @@
 
 import cloudinit.distros.bsd_utils as bsd_utils
 
-from cloudinit.tests.helpers import (CiTestCase, ExitStack, mock)
+from tests.unittests.helpers import (CiTestCase, ExitStack, mock)
 
 RC_FILE = """
 if something; then
diff --git a/tests/unittests/test_distros/test_create_users.py b/tests/unittests/distros/test_create_users.py
index 685f08ba..5baa8a4b 100644
--- a/tests/unittests/test_distros/test_create_users.py
+++ b/tests/unittests/distros/test_create_users.py
@@ -4,7 +4,7 @@ import re
 
 from cloudinit import distros
 from cloudinit import ssh_util
-from cloudinit.tests.helpers import (CiTestCase, mock)
+from tests.unittests.helpers import (CiTestCase, mock)
 from tests.unittests.util import abstract_to_concrete
 
 
diff --git a/tests/unittests/test_distros/test_debian.py b/tests/unittests/distros/test_debian.py
index a88c2686..3d0db145 100644
--- a/tests/unittests/test_distros/test_debian.py
+++ b/tests/unittests/distros/test_debian.py
@@ -9,7 +9,7 @@ from cloudinit.distros.debian import (
     APT_GET_COMMAND,
     APT_GET_WRAPPER,
 )
-from cloudinit.tests.helpers import FilesystemMockingTestCase
+from tests.unittests.helpers import FilesystemMockingTestCase
 from cloudinit import subp
 
 
diff --git a/tests/unittests/test_distros/test_dragonflybsd.py b/tests/unittests/distros/test_dragonflybsd.py
index df2c00f4..f0cd1b24 100644
--- a/tests/unittests/test_distros/test_dragonflybsd.py
+++ b/tests/unittests/distros/test_dragonflybsd.py
@@ -2,7 +2,7 @@
 
 
 import cloudinit.util
-from cloudinit.tests.helpers import mock
+from tests.unittests.helpers import mock
 
 
 def test_find_dragonflybsd_part():
diff --git a/tests/unittests/test_distros/test_freebsd.py b/tests/unittests/distros/test_freebsd.py
index be565b04..0279e86f 100644
--- a/tests/unittests/test_distros/test_freebsd.py
+++ b/tests/unittests/distros/test_freebsd.py
@@ -1,7 +1,7 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
 from cloudinit.util import (find_freebsd_part, get_path_dev_freebsd)
-from cloudinit.tests.helpers import (CiTestCase, mock)
+from tests.unittests.helpers import (CiTestCase, mock)
 
 import os
 
diff --git a/tests/unittests/test_distros/test_generic.py b/tests/unittests/distros/test_generic.py
index 336150bc..e542c26f 100644
--- a/tests/unittests/test_distros/test_generic.py
+++ b/tests/unittests/distros/test_generic.py
@@ -3,7 +3,7 @@
 from cloudinit import distros
 from cloudinit import util
 
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 
 import os
 import pytest
diff --git a/tests/unittests/test_distros/test_gentoo.py b/tests/unittests/distros/test_gentoo.py
index 37a4f51f..4e4680b8 100644
--- a/tests/unittests/test_distros/test_gentoo.py
+++ b/tests/unittests/distros/test_gentoo.py
@@ -2,7 +2,7 @@
 
 from cloudinit import util
 from cloudinit import atomic_helper
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 from . import _get_distro
 
 
diff --git a/tests/unittests/test_distros/test_hostname.py b/tests/unittests/distros/test_hostname.py
index f6d4dbe5..f6d4dbe5 100644
--- a/tests/unittests/test_distros/test_hostname.py
+++ b/tests/unittests/distros/test_hostname.py
diff --git a/tests/unittests/test_distros/test_hosts.py b/tests/unittests/distros/test_hosts.py
index 8aaa6e48..8aaa6e48 100644
--- a/tests/unittests/test_distros/test_hosts.py
+++ b/tests/unittests/distros/test_hosts.py
diff --git a/cloudinit/distros/tests/test_init.py b/tests/unittests/distros/test_init.py
index fd64a322..fd64a322 100644
--- a/cloudinit/distros/tests/test_init.py
+++ b/tests/unittests/distros/test_init.py
diff --git a/tests/unittests/test_distros/test_manage_service.py b/tests/unittests/distros/test_manage_service.py
index 47e7cfb0..6f1bd0b1 100644
--- a/tests/unittests/test_distros/test_manage_service.py
+++ b/tests/unittests/distros/test_manage_service.py
@@ -1,7 +1,7 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-from cloudinit.tests.helpers import (CiTestCase, mock)
-from tests.unittests.util import TestingDistro
+from tests.unittests.helpers import (CiTestCase, mock)
+from tests.unittests.util import MockDistro
 
 
 class TestManageService(CiTestCase):
@@ -10,9 +10,9 @@ class TestManageService(CiTestCase):
 
     def setUp(self):
         super(TestManageService, self).setUp()
-        self.dist = TestingDistro()
+        self.dist = MockDistro()
 
-    @mock.patch.object(TestingDistro, 'uses_systemd', return_value=False)
+    @mock.patch.object(MockDistro, 'uses_systemd', return_value=False)
     @mock.patch("cloudinit.distros.subp.subp")
     def test_manage_service_systemctl_initcmd(self, m_subp, m_sysd):
         self.dist.init_cmd = ['systemctl']
@@ -20,14 +20,14 @@ class TestManageService(CiTestCase):
         m_subp.assert_called_with(['systemctl', 'start', 'myssh'],
                                   capture=True)
 
-    @mock.patch.object(TestingDistro, 'uses_systemd', return_value=False)
+    @mock.patch.object(MockDistro, 'uses_systemd', return_value=False)
     @mock.patch("cloudinit.distros.subp.subp")
     def test_manage_service_service_initcmd(self, m_subp, m_sysd):
         self.dist.init_cmd = ['service']
         self.dist.manage_service('start', 'myssh')
         m_subp.assert_called_with(['service', 'myssh', 'start'], capture=True)
 
-    @mock.patch.object(TestingDistro, 'uses_systemd', return_value=True)
+    @mock.patch.object(MockDistro, 'uses_systemd', return_value=True)
     @mock.patch("cloudinit.distros.subp.subp")
     def test_manage_service_systemctl(self, m_subp, m_sysd):
         self.dist.init_cmd = ['ignore']
diff --git a/tests/unittests/test_distros/test_netbsd.py b/tests/unittests/distros/test_netbsd.py
index 11a68d2a..11a68d2a 100644
--- a/tests/unittests/test_distros/test_netbsd.py
+++ b/tests/unittests/distros/test_netbsd.py
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/distros/test_netconfig.py
index e4eba179..90ac5578 100644
--- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/distros/test_netconfig.py
@@ -11,7 +11,7 @@ from cloudinit import distros
 from cloudinit.distros.parsers.sys_conf import SysConf
 from cloudinit import helpers
 from cloudinit import settings
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     FilesystemMockingTestCase, dir2dict)
 from cloudinit import subp
 from cloudinit import util
diff --git a/cloudinit/distros/tests/test_networking.py b/tests/unittests/distros/test_networking.py
index ec508f4d..ec508f4d 100644
--- a/cloudinit/distros/tests/test_networking.py
+++ b/tests/unittests/distros/test_networking.py
diff --git a/tests/unittests/test_distros/test_opensuse.py b/tests/unittests/distros/test_opensuse.py
index b9bb9b3e..4ff26102 100644
--- a/tests/unittests/test_distros/test_opensuse.py
+++ b/tests/unittests/distros/test_opensuse.py
@@ -1,6 +1,6 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 from . import _get_distro
 
diff --git a/tests/unittests/test_distros/test_photon.py b/tests/unittests/distros/test_photon.py
index 1c3145ca..3858f723 100644
--- a/tests/unittests/test_distros/test_photon.py
+++ b/tests/unittests/distros/test_photon.py
@@ -2,8 +2,8 @@
 
 from . import _get_distro
 from cloudinit import util
-from cloudinit.tests.helpers import mock
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import mock
+from tests.unittests.helpers import CiTestCase
 
 SYSTEM_INFO = {
     'paths': {
diff --git a/tests/unittests/test_distros/test_resolv.py b/tests/unittests/distros/test_resolv.py
index 7d940750..e7971627 100644
--- a/tests/unittests/test_distros/test_resolv.py
+++ b/tests/unittests/distros/test_resolv.py
@@ -2,7 +2,7 @@
 
 from cloudinit.distros.parsers import resolv_conf
 
-from cloudinit.tests.helpers import TestCase
+from tests.unittests.helpers import TestCase
 
 import re
 
diff --git a/tests/unittests/test_distros/test_sles.py b/tests/unittests/distros/test_sles.py
index 33e3c457..04514a19 100644
--- a/tests/unittests/test_distros/test_sles.py
+++ b/tests/unittests/distros/test_sles.py
@@ -1,6 +1,6 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 from . import _get_distro
 
diff --git a/tests/unittests/test_distros/test_sysconfig.py b/tests/unittests/distros/test_sysconfig.py
index c1d5b693..4368496d 100644
--- a/tests/unittests/test_distros/test_sysconfig.py
+++ b/tests/unittests/distros/test_sysconfig.py
@@ -4,7 +4,7 @@ import re
 
 from cloudinit.distros.parsers.sys_conf import SysConf
 
-from cloudinit.tests.helpers import TestCase
+from tests.unittests.helpers import TestCase
 
 
 # Lots of good examples @
diff --git a/tests/unittests/test_distros/test_user_data_normalize.py b/tests/unittests/distros/test_user_data_normalize.py
index 50c86942..bd8f2adb 100644
--- a/tests/unittests/test_distros/test_user_data_normalize.py
+++ b/tests/unittests/distros/test_user_data_normalize.py
@@ -7,7 +7,7 @@ from cloudinit.distros import ug_util
 from cloudinit import helpers
 from cloudinit import settings
 
-from cloudinit.tests.helpers import TestCase
+from tests.unittests.helpers import TestCase
 
 
 bcfg = {
diff --git a/cloudinit/sources/tests/__init__.py b/tests/unittests/filters/__init__.py
index e69de29b..e69de29b 100644
--- a/cloudinit/sources/tests/__init__.py
+++ b/tests/unittests/filters/__init__.py
diff --git a/tests/unittests/test_filters/test_launch_index.py b/tests/unittests/filters/test_launch_index.py
index 1492361e..0b1a7067 100644
--- a/tests/unittests/test_filters/test_launch_index.py
+++ b/tests/unittests/filters/test_launch_index.py
@@ -3,7 +3,7 @@
 import copy
 from itertools import filterfalse
 
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 
 from cloudinit.filters import launch_index
 from cloudinit import user_data as ud
diff --git a/cloudinit/tests/helpers.py b/tests/unittests/helpers.py
index ccd56793..ccd56793 100644
--- a/cloudinit/tests/helpers.py
+++ b/tests/unittests/helpers.py
diff --git a/cloudinit/tests/__init__.py b/tests/unittests/net/__init__.py
index e69de29b..e69de29b 100644
--- a/cloudinit/tests/__init__.py
+++ b/tests/unittests/net/__init__.py
diff --git a/cloudinit/net/tests/test_dhcp.py b/tests/unittests/net/test_dhcp.py
index 28b4ecf7..d3da3981 100644
--- a/cloudinit/net/tests/test_dhcp.py
+++ b/tests/unittests/net/test_dhcp.py
@@ -11,7 +11,7 @@ from cloudinit.net.dhcp import (
     parse_dhcp_lease_file, dhcp_discovery, networkd_load_leases,
     parse_static_routes)
 from cloudinit.util import ensure_file, write_file
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, HttprettyTestCase, mock, populate_dir, wrap_and_call)
 
 
diff --git a/cloudinit/net/tests/test_init.py b/tests/unittests/net/test_init.py
index f9102f7b..666e8425 100644
--- a/cloudinit/net/tests/test_init.py
+++ b/tests/unittests/net/test_init.py
@@ -13,7 +13,7 @@ import requests
 
 import cloudinit.net as net
 from cloudinit import safeyaml as yaml
-from cloudinit.tests.helpers import CiTestCase, HttprettyTestCase
+from tests.unittests.helpers import CiTestCase, HttprettyTestCase
 from cloudinit.subp import ProcessExecutionError
 from cloudinit.util import ensure_file, write_file
 
diff --git a/cloudinit/net/tests/test_network_state.py b/tests/unittests/net/test_network_state.py
index 45e99171..fdcd5296 100644
--- a/cloudinit/net/tests/test_network_state.py
+++ b/tests/unittests/net/test_network_state.py
@@ -6,7 +6,7 @@ import pytest
 
 from cloudinit import safeyaml
 from cloudinit.net import network_state
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 netstate_path = 'cloudinit.net.network_state'
 
diff --git a/cloudinit/net/tests/test_networkd.py b/tests/unittests/net/test_networkd.py
index 8dc90b48..8dc90b48 100644
--- a/cloudinit/net/tests/test_networkd.py
+++ b/tests/unittests/net/test_networkd.py
diff --git a/tests/unittests/test_datasource/__init__.py b/tests/unittests/runs/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unittests/test_datasource/__init__.py
+++ b/tests/unittests/runs/__init__.py
diff --git a/tests/unittests/test_runs/test_merge_run.py b/tests/unittests/runs/test_merge_run.py
index ff27a280..29439c8a 100644
--- a/tests/unittests/test_runs/test_merge_run.py
+++ b/tests/unittests/runs/test_merge_run.py
@@ -4,7 +4,7 @@ import os
 import shutil
 import tempfile
 
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 
 from cloudinit.settings import PER_INSTANCE
 from cloudinit import safeyaml
diff --git a/tests/unittests/test_runs/test_simple_run.py b/tests/unittests/runs/test_simple_run.py
index cb3aae60..aa78dda3 100644
--- a/tests/unittests/test_runs/test_simple_run.py
+++ b/tests/unittests/runs/test_simple_run.py
@@ -7,7 +7,7 @@ import os
 from cloudinit.settings import PER_INSTANCE
 from cloudinit import safeyaml
 from cloudinit import stages
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 from cloudinit import util
 
 
diff --git a/tests/unittests/test_filters/__init__.py b/tests/unittests/sources/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unittests/test_filters/__init__.py
+++ b/tests/unittests/sources/__init__.py
diff --git a/cloudinit/sources/helpers/tests/test_netlink.py b/tests/unittests/sources/helpers/test_netlink.py
index cafe3961..478ce375 100644
--- a/cloudinit/sources/helpers/tests/test_netlink.py
+++ b/tests/unittests/sources/helpers/test_netlink.py
@@ -2,7 +2,7 @@
 #
 # This file is part of cloud-init. See LICENSE file for license information.
 
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 import socket
 import struct
 import codecs
diff --git a/cloudinit/sources/helpers/tests/test_openstack.py b/tests/unittests/sources/helpers/test_openstack.py
index 95fb9743..74743e7c 100644
--- a/cloudinit/sources/helpers/tests/test_openstack.py
+++ b/tests/unittests/sources/helpers/test_openstack.py
@@ -3,7 +3,7 @@
 from unittest import mock
 
 from cloudinit.sources.helpers import openstack
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 
 @mock.patch(
diff --git a/tests/unittests/test_datasource/test_aliyun.py b/tests/unittests/sources/test_aliyun.py
index cab1ac2b..00209913 100644
--- a/tests/unittests/test_datasource/test_aliyun.py
+++ b/tests/unittests/sources/test_aliyun.py
@@ -8,7 +8,7 @@ from unittest import mock
 from cloudinit import helpers
 from cloudinit.sources import DataSourceAliYun as ay
 from cloudinit.sources.DataSourceEc2 import convert_ec2_metadata_network_config
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 DEFAULT_METADATA = {
     'instance-id': 'aliyun-test-vm-00',
diff --git a/tests/unittests/test_datasource/test_altcloud.py b/tests/unittests/sources/test_altcloud.py
index 7a5393ac..7384c104 100644
--- a/tests/unittests/test_datasource/test_altcloud.py
+++ b/tests/unittests/sources/test_altcloud.py
@@ -19,7 +19,7 @@ from cloudinit import helpers
 from cloudinit import subp
 from cloudinit import util
 
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 import cloudinit.sources.DataSourceAltCloud as dsac
 
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/sources/test_azure.py
index 995d2b10..b221a0d7 100644
--- a/tests/unittests/test_datasource/test_azure.py
+++ b/tests/unittests/sources/test_azure.py
@@ -8,7 +8,7 @@ from cloudinit.sources import (
 from cloudinit.util import (b64e, decode_binary, load_file, write_file,
                             MountFailedError, json_dumps, load_json)
 from cloudinit.version import version_string as vs
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     HttprettyTestCase, CiTestCase, populate_dir, mock, wrap_and_call,
     ExitStack, resourceLocation)
 from cloudinit.sources.helpers import netlink
diff --git a/tests/unittests/test_datasource/test_azure_helper.py b/tests/unittests/sources/test_azure_helper.py
index ab4f0b50..24c582c2 100644
--- a/tests/unittests/test_datasource/test_azure_helper.py
+++ b/tests/unittests/sources/test_azure_helper.py
@@ -9,7 +9,7 @@ from xml.etree import ElementTree
 from xml.sax.saxutils import escape, unescape
 
 from cloudinit.sources.helpers import azure as azure_helper
-from cloudinit.tests.helpers import CiTestCase, ExitStack, mock, populate_dir
+from tests.unittests.helpers import CiTestCase, ExitStack, mock, populate_dir
 
 from cloudinit.util import load_file
 from cloudinit.sources.helpers.azure import WALinuxAgentShim as wa_shim
diff --git a/tests/unittests/test_datasource/test_cloudsigma.py b/tests/unittests/sources/test_cloudsigma.py
index 7aa3b1d1..2eae16ee 100644
--- a/tests/unittests/test_datasource/test_cloudsigma.py
+++ b/tests/unittests/sources/test_cloudsigma.py
@@ -8,7 +8,7 @@ from cloudinit import helpers
 from cloudinit import sources
 from cloudinit.sources import DataSourceCloudSigma
 
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 SERVER_CONTEXT = {
     "cpu": 1000,
diff --git a/tests/unittests/test_datasource/test_cloudstack.py b/tests/unittests/sources/test_cloudstack.py
index e68168f2..2b1a1b70 100644
--- a/tests/unittests/test_datasource/test_cloudstack.py
+++ b/tests/unittests/sources/test_cloudstack.py
@@ -5,7 +5,7 @@ from cloudinit import util
 from cloudinit.sources.DataSourceCloudStack import (
     DataSourceCloudStack, get_latest_lease)
 
-from cloudinit.tests.helpers import CiTestCase, ExitStack, mock
+from tests.unittests.helpers import CiTestCase, ExitStack, mock
 
 import os
 import time
diff --git a/tests/unittests/test_datasource/test_common.py b/tests/unittests/sources/test_common.py
index 9089e5de..bb8fa530 100644
--- a/tests/unittests/test_datasource/test_common.py
+++ b/tests/unittests/sources/test_common.py
@@ -34,7 +34,7 @@ from cloudinit.sources import (
 )
 from cloudinit.sources import DataSourceNone as DSNone
 
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 DEFAULT_LOCAL = [
     Azure.DataSourceAzure,
diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/sources/test_configdrive.py
index be13165c..775d0622 100644
--- a/tests/unittests/test_datasource/test_configdrive.py
+++ b/tests/unittests/sources/test_configdrive.py
@@ -12,7 +12,7 @@ from cloudinit.sources import DataSourceConfigDrive as ds
 from cloudinit.sources.helpers import openstack
 from cloudinit import util
 
-from cloudinit.tests.helpers import CiTestCase, ExitStack, mock, populate_dir
+from tests.unittests.helpers import CiTestCase, ExitStack, mock, populate_dir
 
 
 PUBKEY = 'ssh-rsa AAAAB3NzaC1....sIkJhq8wdX+4I3A4cYbYP ubuntu@server-460\n'
diff --git a/tests/unittests/test_datasource/test_digitalocean.py b/tests/unittests/sources/test_digitalocean.py
index 3127014b..351bf7ba 100644
--- a/tests/unittests/test_datasource/test_digitalocean.py
+++ b/tests/unittests/sources/test_digitalocean.py
@@ -13,7 +13,7 @@ from cloudinit import settings
 from cloudinit.sources import DataSourceDigitalOcean
 from cloudinit.sources.helpers import digitalocean
 
-from cloudinit.tests.helpers import mock, CiTestCase
+from tests.unittests.helpers import mock, CiTestCase
 
 DO_MULTIPLE_KEYS = ["ssh-rsa AAAAB3NzaC1yc2EAAAA... test1@do.co",
                     "ssh-rsa AAAAB3NzaC1yc2EAAAA... test2@do.co"]
diff --git a/tests/unittests/test_datasource/test_ec2.py b/tests/unittests/sources/test_ec2.py
index a93f2195..19c2bbcd 100644
--- a/tests/unittests/test_datasource/test_ec2.py
+++ b/tests/unittests/sources/test_ec2.py
@@ -8,7 +8,7 @@ from unittest import mock
 
 from cloudinit import helpers
 from cloudinit.sources import DataSourceEc2 as ec2
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 
 DYNAMIC_METADATA = {
diff --git a/tests/unittests/test_datasource/test_exoscale.py b/tests/unittests/sources/test_exoscale.py
index f0061199..b0ffb7a5 100644
--- a/tests/unittests/test_datasource/test_exoscale.py
+++ b/tests/unittests/sources/test_exoscale.py
@@ -10,7 +10,7 @@ from cloudinit.sources.DataSourceExoscale import (
     get_password,
     PASSWORD_SERVER_PORT,
     read_metadata)
-from cloudinit.tests.helpers import HttprettyTestCase, mock
+from tests.unittests.helpers import HttprettyTestCase, mock
 from cloudinit import util
 
 import httpretty
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/sources/test_gce.py
index 1d91b301..dc768e99 100644
--- a/tests/unittests/test_datasource/test_gce.py
+++ b/tests/unittests/sources/test_gce.py
@@ -18,7 +18,7 @@ from cloudinit import helpers
 from cloudinit import settings
 from cloudinit.sources import DataSourceGCE
 
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 
 GCE_META = {
diff --git a/tests/unittests/test_datasource/test_hetzner.py b/tests/unittests/sources/test_hetzner.py
index eadb92f1..5af0f3db 100644
--- a/tests/unittests/test_datasource/test_hetzner.py
+++ b/tests/unittests/sources/test_hetzner.py
@@ -8,7 +8,7 @@ from cloudinit.sources import DataSourceHetzner
 import cloudinit.sources.helpers.hetzner as hc_helper
 from cloudinit import util, settings, helpers
 
-from cloudinit.tests.helpers import mock, CiTestCase
+from tests.unittests.helpers import mock, CiTestCase
 
 import base64
 import pytest
diff --git a/tests/unittests/test_datasource/test_ibmcloud.py b/tests/unittests/sources/test_ibmcloud.py
index 9013ae9f..38e8e892 100644
--- a/tests/unittests/test_datasource/test_ibmcloud.py
+++ b/tests/unittests/sources/test_ibmcloud.py
@@ -2,7 +2,7 @@
 
 from cloudinit.helpers import Paths
 from cloudinit.sources import DataSourceIBMCloud as ibm
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 from cloudinit import util
 
 import base64
diff --git a/cloudinit/sources/tests/test_init.py b/tests/unittests/sources/test_init.py
index ae09cb17..a1d19518 100644
--- a/cloudinit/sources/tests/test_init.py
+++ b/tests/unittests/sources/test_init.py
@@ -12,7 +12,7 @@ from cloudinit.sources import (
     EXPERIMENTAL_TEXT, INSTANCE_JSON_FILE, INSTANCE_JSON_SENSITIVE_FILE,
     METADATA_UNKNOWN, REDACT_SENSITIVE_VALUE, UNSET, DataSource,
     canonical_cloud_id, redact_sensitive_keys)
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 from cloudinit.user_data import UserDataProcessor
 from cloudinit import util
 
diff --git a/cloudinit/sources/tests/test_lxd.py b/tests/unittests/sources/test_lxd.py
index a6e51f3b..a6e51f3b 100644
--- a/cloudinit/sources/tests/test_lxd.py
+++ b/tests/unittests/sources/test_lxd.py
diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/sources/test_maas.py
index 41b6c27b..34b79587 100644
--- a/tests/unittests/test_datasource/test_maas.py
+++ b/tests/unittests/sources/test_maas.py
@@ -9,7 +9,7 @@ from unittest import mock
 
 from cloudinit.sources import DataSourceMAAS
 from cloudinit import url_helper
-from cloudinit.tests.helpers import CiTestCase, populate_dir
+from tests.unittests.helpers import CiTestCase, populate_dir
 
 
 class TestMAASDataSource(CiTestCase):
diff --git a/tests/unittests/test_datasource/test_nocloud.py b/tests/unittests/sources/test_nocloud.py
index 02cc9b38..26f91054 100644
--- a/tests/unittests/test_datasource/test_nocloud.py
+++ b/tests/unittests/sources/test_nocloud.py
@@ -7,7 +7,7 @@ from cloudinit.sources.DataSourceNoCloud import (
     _maybe_remove_top_network,
     parse_cmdline_data)
 from cloudinit import util
-from cloudinit.tests.helpers import CiTestCase, populate_dir, mock, ExitStack
+from tests.unittests.helpers import CiTestCase, populate_dir, mock, ExitStack
 
 import os
 import textwrap
diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/sources/test_opennebula.py
index 283b65c2..e5963f5a 100644
--- a/tests/unittests/test_datasource/test_opennebula.py
+++ b/tests/unittests/sources/test_opennebula.py
@@ -3,7 +3,7 @@
 from cloudinit import helpers
 from cloudinit.sources import DataSourceOpenNebula as ds
 from cloudinit import util
-from cloudinit.tests.helpers import mock, populate_dir, CiTestCase
+from tests.unittests.helpers import mock, populate_dir, CiTestCase
 
 import os
 import pwd
diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/sources/test_openstack.py
index a9829c75..0d6fb04a 100644
--- a/tests/unittests/test_datasource/test_openstack.py
+++ b/tests/unittests/sources/test_openstack.py
@@ -11,7 +11,7 @@ import re
 from io import StringIO
 from urllib.parse import urlparse
 
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 from cloudinit import helpers
 from cloudinit import settings
diff --git a/cloudinit/sources/tests/test_oracle.py b/tests/unittests/sources/test_oracle.py
index 5f608cbb..2aab097c 100644
--- a/cloudinit/sources/tests/test_oracle.py
+++ b/tests/unittests/sources/test_oracle.py
@@ -11,7 +11,7 @@ import pytest
 from cloudinit.sources import DataSourceOracle as oracle
 from cloudinit.sources import NetworkConfigSource
 from cloudinit.sources.DataSourceOracle import OpcMetadata
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 from cloudinit.url_helper import UrlError
 
 DS_PATH = "cloudinit.sources.DataSourceOracle"
diff --git a/tests/unittests/test_datasource/test_ovf.py b/tests/unittests/sources/test_ovf.py
index ad7446f8..da516731 100644
--- a/tests/unittests/test_datasource/test_ovf.py
+++ b/tests/unittests/sources/test_ovf.py
@@ -12,7 +12,7 @@ from textwrap import dedent
 
 from cloudinit import subp
 from cloudinit import util
-from cloudinit.tests.helpers import CiTestCase, mock, wrap_and_call
+from tests.unittests.helpers import CiTestCase, mock, wrap_and_call
 from cloudinit.helpers import Paths
 from cloudinit.sources import DataSourceOVF as dsovf
 from cloudinit.sources.helpers.vmware.imc.config_custom_script import (
diff --git a/tests/unittests/test_datasource/test_rbx.py b/tests/unittests/sources/test_rbx.py
index d017510e..c1294c92 100644
--- a/tests/unittests/test_datasource/test_rbx.py
+++ b/tests/unittests/sources/test_rbx.py
@@ -3,7 +3,7 @@ import json
 from cloudinit import helpers
 from cloudinit import distros
 from cloudinit.sources import DataSourceRbxCloud as ds
-from cloudinit.tests.helpers import mock, CiTestCase, populate_dir
+from tests.unittests.helpers import mock, CiTestCase, populate_dir
 from cloudinit import subp
 
 DS_PATH = "cloudinit.sources.DataSourceRbxCloud"
diff --git a/tests/unittests/test_datasource/test_scaleway.py b/tests/unittests/sources/test_scaleway.py
index f9e968c5..33ae26b8 100644
--- a/tests/unittests/test_datasource/test_scaleway.py
+++ b/tests/unittests/sources/test_scaleway.py
@@ -10,7 +10,7 @@ from cloudinit import settings
 from cloudinit import sources
 from cloudinit.sources import DataSourceScaleway
 
-from cloudinit.tests.helpers import mock, HttprettyTestCase, CiTestCase
+from tests.unittests.helpers import mock, HttprettyTestCase, CiTestCase
 
 
 class DataResponses(object):
diff --git a/tests/unittests/test_datasource/test_smartos.py b/tests/unittests/sources/test_smartos.py
index 9c499672..e306eded 100644
--- a/tests/unittests/test_datasource/test_smartos.py
+++ b/tests/unittests/sources/test_smartos.py
@@ -35,7 +35,7 @@ from cloudinit import helpers as c_helpers
 from cloudinit.util import (b64e, write_file)
 from cloudinit.subp import (subp, ProcessExecutionError, which)
 
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, mock, FilesystemMockingTestCase, skipIf)
 
 
diff --git a/tests/unittests/test_datasource/test_upcloud.py b/tests/unittests/sources/test_upcloud.py
index cec48b4b..1d792066 100644
--- a/tests/unittests/test_datasource/test_upcloud.py
+++ b/tests/unittests/sources/test_upcloud.py
@@ -10,7 +10,7 @@ from cloudinit import sources
 from cloudinit.sources.DataSourceUpCloud import DataSourceUpCloud, \
     DataSourceUpCloudLocal
 
-from cloudinit.tests.helpers import mock, CiTestCase
+from tests.unittests.helpers import mock, CiTestCase
 
 UC_METADATA = json.loads("""
 {
diff --git a/tests/unittests/test_datasource/test_vmware.py b/tests/unittests/sources/test_vmware.py
index 52f910b5..d34d7782 100644
--- a/tests/unittests/test_datasource/test_vmware.py
+++ b/tests/unittests/sources/test_vmware.py
@@ -13,7 +13,7 @@ import pytest
 from cloudinit import dmi, helpers, safeyaml
 from cloudinit import settings
 from cloudinit.sources import DataSourceVMware
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     mock,
     CiTestCase,
     FilesystemMockingTestCase,
diff --git a/tests/unittests/test_datasource/test_vultr.py b/tests/unittests/sources/test_vultr.py
index 63235009..40594b95 100644
--- a/tests/unittests/test_datasource/test_vultr.py
+++ b/tests/unittests/sources/test_vultr.py
@@ -12,7 +12,7 @@ from cloudinit import settings
 from cloudinit.sources import DataSourceVultr
 from cloudinit.sources.helpers import vultr
 
-from cloudinit.tests.helpers import mock, CiTestCase
+from tests.unittests.helpers import mock, CiTestCase
 
 # Vultr metadata test data
 VULTR_V1_1 = {
diff --git a/tests/unittests/test_handler/__init__.py b/tests/unittests/sources/vmware/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unittests/test_handler/__init__.py
+++ b/tests/unittests/sources/vmware/__init__.py
diff --git a/tests/unittests/test_vmware/test_custom_script.py b/tests/unittests/sources/vmware/test_custom_script.py
index f89f8157..fcbb9cd5 100644
--- a/tests/unittests/test_vmware/test_custom_script.py
+++ b/tests/unittests/sources/vmware/test_custom_script.py
@@ -14,7 +14,7 @@ from cloudinit.sources.helpers.vmware.imc.config_custom_script import (
     PreCustomScript,
     PostCustomScript,
 )
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 
 class TestVmwareCustomScript(CiTestCase):
diff --git a/tests/unittests/test_vmware/test_guestcust_util.py b/tests/unittests/sources/vmware/test_guestcust_util.py
index c8b59d83..9114f0b9 100644
--- a/tests/unittests/test_vmware/test_guestcust_util.py
+++ b/tests/unittests/sources/vmware/test_guestcust_util.py
@@ -12,7 +12,7 @@ from cloudinit.sources.helpers.vmware.imc.guestcust_util import (
     get_tools_config,
     set_gc_status,
 )
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 
 class TestGuestCustUtil(CiTestCase):
diff --git a/tests/unittests/test_vmware_config_file.py b/tests/unittests/sources/vmware/test_vmware_config_file.py
index 430cc69f..54de113e 100644
--- a/tests/unittests/test_vmware_config_file.py
+++ b/tests/unittests/sources/vmware/test_vmware_config_file.py
@@ -19,7 +19,7 @@ from cloudinit.sources.helpers.vmware.imc.config import Config
 from cloudinit.sources.helpers.vmware.imc.config_file import ConfigFile
 from cloudinit.sources.helpers.vmware.imc.config_nic import gen_subnet
 from cloudinit.sources.helpers.vmware.imc.config_nic import NicConfigurator
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 logger = logging.getLogger(__name__)
diff --git a/tests/unittests/test__init__.py b/tests/unittests/test__init__.py
index 739bbebf..4382a078 100644
--- a/tests/unittests/test__init__.py
+++ b/tests/unittests/test__init__.py
@@ -12,7 +12,7 @@ from cloudinit import settings
 from cloudinit import url_helper
 from cloudinit import util
 
-from cloudinit.tests.helpers import TestCase, CiTestCase, ExitStack, mock
+from tests.unittests.helpers import TestCase, CiTestCase, ExitStack, mock
 
 
 class FakeModule(handlers.Handler):
diff --git a/tests/unittests/test_atomic_helper.py b/tests/unittests/test_atomic_helper.py
index 0101b0e3..0c8b8e53 100644
--- a/tests/unittests/test_atomic_helper.py
+++ b/tests/unittests/test_atomic_helper.py
@@ -6,7 +6,7 @@ import stat
 
 from cloudinit import atomic_helper
 
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 
 class TestAtomicHelper(CiTestCase):
diff --git a/tests/unittests/test_builtin_handlers.py b/tests/unittests/test_builtin_handlers.py
index 230866b9..cf2c0a4d 100644
--- a/tests/unittests/test_builtin_handlers.py
+++ b/tests/unittests/test_builtin_handlers.py
@@ -11,7 +11,7 @@ import tempfile
 from textwrap import dedent
 
 
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     FilesystemMockingTestCase, CiTestCase, mock, skipUnlessJinja)
 
 from cloudinit import handlers
diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py
index 1459fd9c..fd717f34 100644
--- a/tests/unittests/test_cli.py
+++ b/tests/unittests/test_cli.py
@@ -5,7 +5,7 @@ import io
 from collections import namedtuple
 
 from cloudinit.cmd import main as cli
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 from cloudinit.util import load_file, load_json
 
 
diff --git a/cloudinit/tests/test_conftest.py b/tests/unittests/test_conftest.py
index 6f1263a5..2e02b7a7 100644
--- a/cloudinit/tests/test_conftest.py
+++ b/tests/unittests/test_conftest.py
@@ -1,7 +1,7 @@
 import pytest
 
 from cloudinit import subp
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 
 class TestDisableSubpUsage:
diff --git a/tests/unittests/test_cs_util.py b/tests/unittests/test_cs_util.py
index bfd07ecf..be9da40c 100644
--- a/tests/unittests/test_cs_util.py
+++ b/tests/unittests/test_cs_util.py
@@ -1,6 +1,6 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 from cloudinit.cs_utils import Cepko
 
diff --git a/tests/unittests/test_data.py b/tests/unittests/test_data.py
index 8c968ae9..2ee09bbb 100644
--- a/tests/unittests/test_data.py
+++ b/tests/unittests/test_data.py
@@ -25,7 +25,7 @@ from cloudinit import user_data as ud
 from cloudinit import safeyaml
 from cloudinit import util
 
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 
 
 INSTANCE_ID = "i-testing"
diff --git a/cloudinit/tests/test_dhclient_hook.py b/tests/unittests/test_dhclient_hook.py
index eadae81c..14549111 100644
--- a/cloudinit/tests/test_dhclient_hook.py
+++ b/tests/unittests/test_dhclient_hook.py
@@ -3,7 +3,7 @@
 """Tests for cloudinit.dhclient_hook."""
 
 from cloudinit import dhclient_hook as dhc
-from cloudinit.tests.helpers import CiTestCase, dir2dict, populate_dir
+from tests.unittests.helpers import CiTestCase, dir2dict, populate_dir
 
 import argparse
 import json
diff --git a/cloudinit/tests/test_dmi.py b/tests/unittests/test_dmi.py
index 78a72122..674e7b98 100644
--- a/cloudinit/tests/test_dmi.py
+++ b/tests/unittests/test_dmi.py
@@ -1,4 +1,4 @@
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 from cloudinit import dmi
 from cloudinit import util
 from cloudinit import subp
diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
index 43603ea5..62c3e403 100644
--- a/tests/unittests/test_ds_identify.py
+++ b/tests/unittests/test_ds_identify.py
@@ -8,7 +8,7 @@ from uuid import uuid4
 from cloudinit import safeyaml
 from cloudinit import subp
 from cloudinit import util
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, dir2dict, populate_dir, populate_dir_with_ts)
 
 from cloudinit.sources import DataSourceIBMCloud as ds_ibm
diff --git a/tests/unittests/test_ec2_util.py b/tests/unittests/test_ec2_util.py
index 3f50f57d..e8e0b5b1 100644
--- a/tests/unittests/test_ec2_util.py
+++ b/tests/unittests/test_ec2_util.py
@@ -2,7 +2,7 @@
 
 import httpretty as hp
 
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 
 from cloudinit import ec2_utils as eu
 from cloudinit import url_helper as uh
diff --git a/cloudinit/tests/test_event.py b/tests/unittests/test_event.py
index 3da4c70c..3da4c70c 100644
--- a/cloudinit/tests/test_event.py
+++ b/tests/unittests/test_event.py
diff --git a/cloudinit/tests/test_features.py b/tests/unittests/test_features.py
index d7a7226d..d7a7226d 100644
--- a/cloudinit/tests/test_features.py
+++ b/tests/unittests/test_features.py
diff --git a/tests/unittests/test_gpg.py b/tests/unittests/test_gpg.py
index 451ffa91..ceada49a 100644
--- a/tests/unittests/test_gpg.py
+++ b/tests/unittests/test_gpg.py
@@ -4,6 +4,8 @@ from unittest import mock
 from cloudinit import gpg
 from cloudinit import subp
 
+from tests.unittests.helpers import CiTestCase
+
 TEST_KEY_HUMAN = '''
 /etc/apt/cloud-init.gpg.d/my_key.gpg
 --------------------------------------------
@@ -79,3 +81,50 @@ class TestGPGCommands:
             test_call = mock.call(
                 ["gpg", "--dearmor"], data='key', decode=False)
             assert test_call == m_subp.call_args
+
+    @mock.patch("cloudinit.gpg.time.sleep")
+    @mock.patch("cloudinit.gpg.subp.subp")
+    class TestReceiveKeys(CiTestCase):
+        """Test the recv_key method."""
+
+        def test_retries_on_subp_exc(self, m_subp, m_sleep):
+            """retry should be done on gpg receive keys failure."""
+            retries = (1, 2, 4)
+            my_exc = subp.ProcessExecutionError(
+                stdout='', stderr='', exit_code=2, cmd=['mycmd'])
+            m_subp.side_effect = (my_exc, my_exc, ('', ''))
+            gpg.recv_key("ABCD", "keyserver.example.com", retries=retries)
+            self.assertEqual(
+                [mock.call(1), mock.call(2)], m_sleep.call_args_list)
+
+        def test_raises_error_after_retries(self, m_subp, m_sleep):
+            """If the final run fails, error should be raised."""
+            naplen = 1
+            keyid, keyserver = ("ABCD", "keyserver.example.com")
+            m_subp.side_effect = subp.ProcessExecutionError(
+                stdout='', stderr='', exit_code=2, cmd=['mycmd'])
+            with self.assertRaises(ValueError) as rcm:
+                gpg.recv_key(keyid, keyserver, retries=(naplen,))
+            self.assertIn(keyid, str(rcm.exception))
+            self.assertIn(keyserver, str(rcm.exception))
+            m_sleep.assert_called_with(naplen)
+
+        def test_no_retries_on_none(self, m_subp, m_sleep):
+            """retry should not be done if retries is None."""
+            m_subp.side_effect = subp.ProcessExecutionError(
+                stdout='', stderr='', exit_code=2, cmd=['mycmd'])
+            with self.assertRaises(ValueError):
+                gpg.recv_key("ABCD", "keyserver.example.com", retries=None)
+            m_sleep.assert_not_called()
+
+        def test_expected_gpg_command(self, m_subp, m_sleep):
+            """Verify gpg is called with expected args."""
+            key, keyserver = ("DEADBEEF", "keyserver.example.com")
+            retries = (1, 2, 4)
+            m_subp.return_value = ('', '')
+            gpg.recv_key(key, keyserver, retries=retries)
+            m_subp.assert_called_once_with(
+                ['gpg', '--no-tty',
+                 '--keyserver=%s' % keyserver, '--recv-keys', key],
+                capture=True)
+            m_sleep.assert_not_called()
diff --git a/tests/unittests/test_helpers.py b/tests/unittests/test_helpers.py
index 2e4582a0..c6f9b94a 100644
--- a/tests/unittests/test_helpers.py
+++ b/tests/unittests/test_helpers.py
@@ -4,7 +4,7 @@
 
 import os
 
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 
 from cloudinit import sources
 
diff --git a/tests/unittests/test_log.py b/tests/unittests/test_log.py
index e069a487..3d1b9582 100644
--- a/tests/unittests/test_log.py
+++ b/tests/unittests/test_log.py
@@ -9,7 +9,7 @@ import time
 
 from cloudinit import log as ci_logging
 from cloudinit.analyze.dump import CLOUD_INIT_ASCTIME_FMT
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 
 class TestCloudInitLogger(CiTestCase):
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py
index 10871bcf..48ab6602 100644
--- a/tests/unittests/test_merging.py
+++ b/tests/unittests/test_merging.py
@@ -1,6 +1,6 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-from cloudinit.tests import helpers
+from tests.unittests import helpers
 
 from cloudinit.handlers import cloud_config
 from cloudinit.handlers import (CONTENT_START, CONTENT_END)
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 57edc89a..b5c38c55 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -12,7 +12,7 @@ from cloudinit import subp
 from cloudinit import util
 from cloudinit import safeyaml as yaml
 
-from cloudinit.tests.helpers import (
+from tests.unittests.helpers import (
     CiTestCase, FilesystemMockingTestCase, dir2dict, mock, populate_dir)
 
 import base64
diff --git a/tests/unittests/test_net_freebsd.py b/tests/unittests/test_net_freebsd.py
index e339e132..f0dde097 100644
--- a/tests/unittests/test_net_freebsd.py
+++ b/tests/unittests/test_net_freebsd.py
@@ -3,7 +3,7 @@ import os
 import cloudinit.net
 import cloudinit.net.network_state
 from cloudinit import safeyaml
-from cloudinit.tests.helpers import (CiTestCase, mock, readResource, dir2dict)
+from tests.unittests.helpers import (CiTestCase, mock, readResource, dir2dict)
 
 
 SAMPLE_FREEBSD_IFCONFIG_OUT = readResource("netinfo/freebsd-ifconfig-output")
diff --git a/cloudinit/tests/test_netinfo.py b/tests/unittests/test_netinfo.py
index e44b16d8..238f7b0a 100644
--- a/cloudinit/tests/test_netinfo.py
+++ b/tests/unittests/test_netinfo.py
@@ -5,7 +5,7 @@
 from copy import copy
 
 from cloudinit.netinfo import netdev_info, netdev_pformat, route_pformat
-from cloudinit.tests.helpers import CiTestCase, mock, readResource
+from tests.unittests.helpers import CiTestCase, mock, readResource
 
 
 # Example ifconfig and route output
diff --git a/tests/unittests/test_pathprefix2dict.py b/tests/unittests/test_pathprefix2dict.py
index abbb29b8..4e737ad7 100644
--- a/tests/unittests/test_pathprefix2dict.py
+++ b/tests/unittests/test_pathprefix2dict.py
@@ -2,7 +2,7 @@
 
 from cloudinit import util
 
-from cloudinit.tests.helpers import TestCase, populate_dir
+from tests.unittests.helpers import TestCase, populate_dir
 
 import shutil
 import tempfile
diff --git a/cloudinit/tests/test_persistence.py b/tests/unittests/test_persistence.py
index ec1152a9..ec1152a9 100644
--- a/cloudinit/tests/test_persistence.py
+++ b/tests/unittests/test_persistence.py
diff --git a/tests/unittests/test_registry.py b/tests/unittests/test_registry.py
index 2b625026..4c7df186 100644
--- a/tests/unittests/test_registry.py
+++ b/tests/unittests/test_registry.py
@@ -2,7 +2,7 @@
 
 from cloudinit.registry import DictRegistry
 
-from cloudinit.tests.helpers import (mock, TestCase)
+from tests.unittests.helpers import (mock, TestCase)
 
 
 class TestDictRegistry(TestCase):
diff --git a/tests/unittests/test_reporting.py b/tests/unittests/test_reporting.py
index b78a6939..3aaeea43 100644
--- a/tests/unittests/test_reporting.py
+++ b/tests/unittests/test_reporting.py
@@ -8,7 +8,7 @@ from cloudinit import reporting
 from cloudinit.reporting import events
 from cloudinit.reporting import handlers
 
-from cloudinit.tests.helpers import TestCase
+from tests.unittests.helpers import TestCase
 
 
 def _fake_registry():
diff --git a/tests/unittests/test_reporting_hyperv.py b/tests/unittests/test_reporting_hyperv.py
index 9324b78d..24a1dcc7 100644
--- a/tests/unittests/test_reporting_hyperv.py
+++ b/tests/unittests/test_reporting_hyperv.py
@@ -13,7 +13,7 @@ import re
 from unittest import mock
 
 from cloudinit import util
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 from cloudinit.sources.helpers import azure
 
 
diff --git a/tests/unittests/test_runs/__init__.py b/tests/unittests/test_runs/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/tests/unittests/test_runs/__init__.py
+++ /dev/null
diff --git a/cloudinit/tests/test_simpletable.py b/tests/unittests/test_simpletable.py
index a12a62a0..69b30f0e 100644
--- a/cloudinit/tests/test_simpletable.py
+++ b/tests/unittests/test_simpletable.py
@@ -10,7 +10,7 @@ reimplement the entire library, only the minimal parts we actually use.
 """
 
 from cloudinit.simpletable import SimpleTable
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 # Examples rendered by cloud-init using PrettyTable
 NET_DEVICE_FIELDS = (
diff --git a/tests/unittests/test_sshutil.py b/tests/unittests/test_sshutil.py
index 08e20050..b210bd3b 100644
--- a/tests/unittests/test_sshutil.py
+++ b/tests/unittests/test_sshutil.py
@@ -7,7 +7,7 @@ from functools import partial
 from unittest.mock import patch
 
 from cloudinit import ssh_util
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 from cloudinit import util
 
 # https://stackoverflow.com/questions/11351032/
diff --git a/cloudinit/tests/test_stages.py b/tests/unittests/test_stages.py
index a50836a4..a722f03f 100644
--- a/cloudinit/tests/test_stages.py
+++ b/tests/unittests/test_stages.py
@@ -13,7 +13,7 @@ from cloudinit.sources import NetworkConfigSource
 from cloudinit.event import EventScope, EventType
 from cloudinit.util import write_file
 
-from cloudinit.tests.helpers import CiTestCase, mock
+from tests.unittests.helpers import CiTestCase, mock
 
 TEST_INSTANCE_ID = 'i-testing'
 
diff --git a/cloudinit/tests/test_subp.py b/tests/unittests/test_subp.py
index 515d5d64..ec513d01 100644
--- a/cloudinit/tests/test_subp.py
+++ b/tests/unittests/test_subp.py
@@ -10,7 +10,7 @@ import stat
 from unittest import mock
 
 from cloudinit import subp, util
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 
 
 BASH = subp.which('bash')
diff --git a/cloudinit/tests/test_temp_utils.py b/tests/unittests/test_temp_utils.py
index 4a52ef89..9d56d0d0 100644
--- a/cloudinit/tests/test_temp_utils.py
+++ b/tests/unittests/test_temp_utils.py
@@ -3,7 +3,7 @@
 """Tests for cloudinit.temp_utils"""
 
 from cloudinit.temp_utils import mkdtemp, mkstemp, tempdir
-from cloudinit.tests.helpers import CiTestCase, wrap_and_call
+from tests.unittests.helpers import CiTestCase, wrap_and_call
 import os
 
 
diff --git a/tests/unittests/test_templating.py b/tests/unittests/test_templating.py
index cba09830..459e017b 100644
--- a/tests/unittests/test_templating.py
+++ b/tests/unittests/test_templating.py
@@ -4,7 +4,7 @@
 #
 # This file is part of cloud-init. See LICENSE file for license information.
 
-from cloudinit.tests import helpers as test_helpers
+from tests.unittests import helpers as test_helpers
 import textwrap
 
 from cloudinit import templater
diff --git a/cloudinit/tests/test_upgrade.py b/tests/unittests/test_upgrade.py
index da3ab23b..d7a721a2 100644
--- a/cloudinit/tests/test_upgrade.py
+++ b/tests/unittests/test_upgrade.py
@@ -19,7 +19,7 @@ import pathlib
 import pytest
 
 from cloudinit.stages import _pkl_load
-from cloudinit.tests.helpers import resourceLocation
+from tests.unittests.helpers import resourceLocation
 
 
 class TestUpgrade:
diff --git a/cloudinit/tests/test_url_helper.py b/tests/unittests/test_url_helper.py
index c3918f80..501d9533 100644
--- a/cloudinit/tests/test_url_helper.py
+++ b/tests/unittests/test_url_helper.py
@@ -3,7 +3,7 @@
 from cloudinit.url_helper import (
     NOT_FOUND, UrlError, REDACTED, oauth_headers, read_file_or_url,
     retry_on_url_exc)
-from cloudinit.tests.helpers import CiTestCase, mock, skipIf
+from tests.unittests.helpers import CiTestCase, mock, skipIf
 from cloudinit import util
 from cloudinit import version
 
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index bc30c90b..1290cbc6 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -1,23 +1,1311 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
-import io
+"""Tests for cloudinit.util"""
+
+import base64
 import logging
+import json
+import platform
+import pytest
+
+import io
 import os
 import re
 import shutil
 import stat
 import tempfile
-import pytest
 import yaml
 from unittest import mock
 
 from cloudinit import subp
 from cloudinit import importer, util
-from cloudinit.tests import helpers
+from tests.unittests import helpers
+
+
+from tests.unittests.helpers import CiTestCase
+from textwrap import dedent
+
+LOG = logging.getLogger(__name__)
+
+MOUNT_INFO = [
+    '68 0 8:3 / / ro,relatime shared:1 - btrfs /dev/sda1 ro,attr2,inode64',
+    '153 68 254:0 / /home rw,relatime shared:101 - xfs /dev/sda2 rw,attr2',
+]
+
+OS_RELEASE_SLES = dedent(
+    """\
+    NAME="SLES"
+    VERSION="12-SP3"
+    VERSION_ID="12.3"
+    PRETTY_NAME="SUSE Linux Enterprise Server 12 SP3"
+    ID="sles"
+    ANSI_COLOR="0;32"
+    CPE_NAME="cpe:/o:suse:sles:12:sp3"
+"""
+)
+
+OS_RELEASE_OPENSUSE = dedent(
+    """\
+    NAME="openSUSE Leap"
+    VERSION="42.3"
+    ID=opensuse
+    ID_LIKE="suse"
+    VERSION_ID="42.3"
+    PRETTY_NAME="openSUSE Leap 42.3"
+    ANSI_COLOR="0;32"
+    CPE_NAME="cpe:/o:opensuse:leap:42.3"
+    BUG_REPORT_URL="https://bugs.opensuse.org"
+    HOME_URL="https://www.opensuse.org/"
+"""
+)
+
+OS_RELEASE_OPENSUSE_L15 = dedent(
+    """\
+    NAME="openSUSE Leap"
+    VERSION="15.0"
+    ID="opensuse-leap"
+    ID_LIKE="suse opensuse"
+    VERSION_ID="15.0"
+    PRETTY_NAME="openSUSE Leap 15.0"
+    ANSI_COLOR="0;32"
+    CPE_NAME="cpe:/o:opensuse:leap:15.0"
+    BUG_REPORT_URL="https://bugs.opensuse.org"
+    HOME_URL="https://www.opensuse.org/"
+"""
+)
+
+OS_RELEASE_OPENSUSE_TW = dedent(
+    """\
+    NAME="openSUSE Tumbleweed"
+    ID="opensuse-tumbleweed"
+    ID_LIKE="opensuse suse"
+    VERSION_ID="20180920"
+    PRETTY_NAME="openSUSE Tumbleweed"
+    ANSI_COLOR="0;32"
+    CPE_NAME="cpe:/o:opensuse:tumbleweed:20180920"
+    BUG_REPORT_URL="https://bugs.opensuse.org"
+    HOME_URL="https://www.opensuse.org/"
+"""
+)
+
+OS_RELEASE_CENTOS = dedent(
+    """\
+    NAME="CentOS Linux"
+    VERSION="7 (Core)"
+    ID="centos"
+    ID_LIKE="rhel fedora"
+    VERSION_ID="7"
+    PRETTY_NAME="CentOS Linux 7 (Core)"
+    ANSI_COLOR="0;31"
+    CPE_NAME="cpe:/o:centos:centos:7"
+    HOME_URL="https://www.centos.org/"
+    BUG_REPORT_URL="https://bugs.centos.org/"
+
+    CENTOS_MANTISBT_PROJECT="CentOS-7"
+    CENTOS_MANTISBT_PROJECT_VERSION="7"
+    REDHAT_SUPPORT_PRODUCT="centos"
+    REDHAT_SUPPORT_PRODUCT_VERSION="7"
+"""
+)
+
+OS_RELEASE_REDHAT_7 = dedent(
+    """\
+    NAME="Red Hat Enterprise Linux Server"
+    VERSION="7.5 (Maipo)"
+    ID="rhel"
+    ID_LIKE="fedora"
+    VARIANT="Server"
+    VARIANT_ID="server"
+    VERSION_ID="7.5"
+    PRETTY_NAME="Red Hat"
+    ANSI_COLOR="0;31"
+    CPE_NAME="cpe:/o:redhat:enterprise_linux:7.5:GA:server"
+    HOME_URL="https://www.redhat.com/"
+    BUG_REPORT_URL="https://bugzilla.redhat.com/"
+
+    REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 7"
+    REDHAT_BUGZILLA_PRODUCT_VERSION=7.5
+    REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
+    REDHAT_SUPPORT_PRODUCT_VERSION="7.5"
+"""
+)
+
+OS_RELEASE_ALMALINUX_8 = dedent(
+    """\
+    NAME="AlmaLinux"
+    VERSION="8.3 (Purple Manul)"
+    ID="almalinux"
+    ID_LIKE="rhel centos fedora"
+    VERSION_ID="8.3"
+    PLATFORM_ID="platform:el8"
+    PRETTY_NAME="AlmaLinux 8.3 (Purple Manul)"
+    ANSI_COLOR="0;34"
+    CPE_NAME="cpe:/o:almalinux:almalinux:8.3:GA"
+    HOME_URL="https://almalinux.org/"
+    BUG_REPORT_URL="https://bugs.almalinux.org/"
+
+    ALMALINUX_MANTISBT_PROJECT="AlmaLinux-8"
+    ALMALINUX_MANTISBT_PROJECT_VERSION="8.3"
+"""
+)
+
+OS_RELEASE_EUROLINUX_7 = dedent(
+    """\
+    VERSION="7.9 (Minsk)"
+    ID="eurolinux"
+    ID_LIKE="rhel scientific centos fedora"
+    VERSION_ID="7.9"
+    PRETTY_NAME="EuroLinux 7.9 (Minsk)"
+    ANSI_COLOR="0;31"
+    CPE_NAME="cpe:/o:eurolinux:eurolinux:7.9:GA"
+    HOME_URL="http://www.euro-linux.com/"
+    BUG_REPORT_URL="mailto:support@euro-linux.com"
+    REDHAT_BUGZILLA_PRODUCT="EuroLinux 7"
+    REDHAT_BUGZILLA_PRODUCT_VERSION=7.9
+    REDHAT_SUPPORT_PRODUCT="EuroLinux"
+    REDHAT_SUPPORT_PRODUCT_VERSION="7.9"
+"""
+)
+
+OS_RELEASE_EUROLINUX_8 = dedent(
+    """\
+    NAME="EuroLinux"
+    VERSION="8.4 (Vaduz)"
+    ID="eurolinux"
+    ID_LIKE="rhel fedora centos"
+    VERSION_ID="8.4"
+    PLATFORM_ID="platform:el8"
+    PRETTY_NAME="EuroLinux 8.4 (Vaduz)"
+    ANSI_COLOR="0;34"
+    CPE_NAME="cpe:/o:eurolinux:eurolinux:8"
+    HOME_URL="https://www.euro-linux.com/"
+    BUG_REPORT_URL="https://github.com/EuroLinux/eurolinux-distro-bugs-and-rfc/"
+    REDHAT_SUPPORT_PRODUCT="EuroLinux"
+    REDHAT_SUPPORT_PRODUCT_VERSION="8"
+"""
+)
+
+OS_RELEASE_ROCKY_8 = dedent(
+    """\
+    NAME="Rocky Linux"
+    VERSION="8.3 (Green Obsidian)"
+    ID="rocky"
+    ID_LIKE="rhel fedora"
+    VERSION_ID="8.3"
+    PLATFORM_ID="platform:el8"
+    PRETTY_NAME="Rocky Linux 8.3 (Green Obsidian)"
+    ANSI_COLOR="0;31"
+    CPE_NAME="cpe:/o:rocky:rocky:8"
+    HOME_URL="https://rockylinux.org/"
+    BUG_REPORT_URL="https://bugs.rockylinux.org/"
+    ROCKY_SUPPORT_PRODUCT="Rocky Linux"
+    ROCKY_SUPPORT_PRODUCT_VERSION="8"
+"""
+)
+
+OS_RELEASE_VIRTUOZZO_8 = dedent(
+    """\
+    NAME="Virtuozzo Linux"
+    VERSION="8"
+    ID="virtuozzo"
+    ID_LIKE="rhel fedora"
+    VERSION_ID="8"
+    PLATFORM_ID="platform:el8"
+    PRETTY_NAME="Virtuozzo Linux"
+    ANSI_COLOR="0;31"
+    CPE_NAME="cpe:/o:virtuozzoproject:vzlinux:8"
+    HOME_URL="https://www.vzlinux.org"
+    BUG_REPORT_URL="https://bugs.openvz.org"
+"""
+)
+
+OS_RELEASE_CLOUDLINUX_8 = dedent(
+    """\
+    NAME="CloudLinux"
+    VERSION="8.4 (Valery Rozhdestvensky)"
+    ID="cloudlinux"
+    ID_LIKE="rhel fedora centos"
+    VERSION_ID="8.4"
+    PLATFORM_ID="platform:el8"
+    PRETTY_NAME="CloudLinux 8.4 (Valery Rozhdestvensky)"
+    ANSI_COLOR="0;31"
+    CPE_NAME="cpe:/o:cloudlinux:cloudlinux:8.4:GA:server"
+    HOME_URL="https://www.cloudlinux.com/"
+    BUG_REPORT_URL="https://www.cloudlinux.com/support"
+"""
+)
+
+OS_RELEASE_OPENEULER_20 = dedent(
+    """\
+    NAME="openEuler"
+    VERSION="20.03 (LTS-SP2)"
+    ID="openEuler"
+    VERSION_ID="20.03"
+    PRETTY_NAME="openEuler 20.03 (LTS-SP2)"
+    ANSI_COLOR="0;31"
+"""
+)
+
+REDHAT_RELEASE_CENTOS_6 = "CentOS release 6.10 (Final)"
+REDHAT_RELEASE_CENTOS_7 = "CentOS Linux release 7.5.1804 (Core)"
+REDHAT_RELEASE_REDHAT_6 = (
+    "Red Hat Enterprise Linux Server release 6.10 (Santiago)"
+)
+REDHAT_RELEASE_REDHAT_7 = "Red Hat Enterprise Linux Server release 7.5 (Maipo)"
+REDHAT_RELEASE_ALMALINUX_8 = "AlmaLinux release 8.3 (Purple Manul)"
+REDHAT_RELEASE_EUROLINUX_7 = "EuroLinux release 7.9 (Minsk)"
+REDHAT_RELEASE_EUROLINUX_8 = "EuroLinux release 8.4 (Vaduz)"
+REDHAT_RELEASE_ROCKY_8 = "Rocky Linux release 8.3 (Green Obsidian)"
+REDHAT_RELEASE_VIRTUOZZO_8 = "Virtuozzo Linux release 8"
+REDHAT_RELEASE_CLOUDLINUX_8 = "CloudLinux release 8.4 (Valery Rozhdestvensky)"
+OS_RELEASE_DEBIAN = dedent(
+    """\
+    PRETTY_NAME="Debian GNU/Linux 9 (stretch)"
+    NAME="Debian GNU/Linux"
+    VERSION_ID="9"
+    VERSION="9 (stretch)"
+    ID=debian
+    HOME_URL="https://www.debian.org/"
+    SUPPORT_URL="https://www.debian.org/support"
+    BUG_REPORT_URL="https://bugs.debian.org/"
+"""
+)
+
+OS_RELEASE_UBUNTU = dedent(
+    """\
+    NAME="Ubuntu"\n
+    # comment test
+    VERSION="16.04.3 LTS (Xenial Xerus)"\n
+    ID=ubuntu\n
+    ID_LIKE=debian\n
+    PRETTY_NAME="Ubuntu 16.04.3 LTS"\n
+    VERSION_ID="16.04"\n
+    HOME_URL="http://www.ubuntu.com/"\n
+    SUPPORT_URL="http://help.ubuntu.com/"\n
+    BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"\n
+    VERSION_CODENAME=xenial\n
+    UBUNTU_CODENAME=xenial\n
+"""
+)
+
+OS_RELEASE_PHOTON = """\
+        NAME="VMware Photon OS"
+        VERSION="4.0"
+        ID=photon
+        VERSION_ID=4.0
+        PRETTY_NAME="VMware Photon OS/Linux"
+        ANSI_COLOR="1;34"
+        HOME_URL="https://vmware.github.io/photon/"
+        BUG_REPORT_URL="https://github.com/vmware/photon/issues"
+"""
+
+
+class FakeCloud(object):
+    def __init__(self, hostname, fqdn):
+        self.hostname = hostname
+        self.fqdn = fqdn
+        self.calls = []
+
+    def get_hostname(self, fqdn=None, metadata_only=None):
+        myargs = {}
+        if fqdn is not None:
+            myargs['fqdn'] = fqdn
+        if metadata_only is not None:
+            myargs['metadata_only'] = metadata_only
+        self.calls.append(myargs)
+        if fqdn:
+            return self.fqdn
+        return self.hostname
+
+
+class TestUtil(CiTestCase):
+    def test_parse_mount_info_no_opts_no_arg(self):
+        result = util.parse_mount_info('/home', MOUNT_INFO, LOG)
+        self.assertEqual(('/dev/sda2', 'xfs', '/home'), result)
+
+    def test_parse_mount_info_no_opts_arg(self):
+        result = util.parse_mount_info('/home', MOUNT_INFO, LOG, False)
+        self.assertEqual(('/dev/sda2', 'xfs', '/home'), result)
+
+    def test_parse_mount_info_with_opts(self):
+        result = util.parse_mount_info('/', MOUNT_INFO, LOG, True)
+        self.assertEqual(('/dev/sda1', 'btrfs', '/', 'ro,relatime'), result)
+
+    @mock.patch('cloudinit.util.get_mount_info')
+    def test_mount_is_rw(self, m_mount_info):
+        m_mount_info.return_value = ('/dev/sda1', 'btrfs', '/', 'rw,relatime')
+        is_rw = util.mount_is_read_write('/')
+        self.assertEqual(is_rw, True)
+
+    @mock.patch('cloudinit.util.get_mount_info')
+    def test_mount_is_ro(self, m_mount_info):
+        m_mount_info.return_value = ('/dev/sda1', 'btrfs', '/', 'ro,relatime')
+        is_rw = util.mount_is_read_write('/')
+        self.assertEqual(is_rw, False)
+
+
+class TestUptime(CiTestCase):
+    @mock.patch('cloudinit.util.boottime')
+    @mock.patch('cloudinit.util.os.path.exists')
+    @mock.patch('cloudinit.util.time.time')
+    def test_uptime_non_linux_path(self, m_time, m_exists, m_boottime):
+        boottime = 1000.0
+        uptime = 10.0
+        m_boottime.return_value = boottime
+        m_time.return_value = boottime + uptime
+        m_exists.return_value = False
+        result = util.uptime()
+        self.assertEqual(str(uptime), result)
+
+
+class TestShellify(CiTestCase):
+    def test_input_dict_raises_type_error(self):
+        self.assertRaisesRegex(
+            TypeError,
+            'Input.*was.*dict.*xpected',
+            util.shellify,
+            {'mykey': 'myval'},
+        )
 
+    def test_input_str_raises_type_error(self):
+        self.assertRaisesRegex(
+            TypeError, 'Input.*was.*str.*xpected', util.shellify, "foobar"
+        )
 
-class FakeSelinux(object):
+    def test_value_with_int_raises_type_error(self):
+        self.assertRaisesRegex(
+            TypeError, 'shellify.*int', util.shellify, ["foo", 1]
+        )
+
+    def test_supports_strings_and_lists(self):
+        self.assertEqual(
+            '\n'.join(
+                [
+                    "#!/bin/sh",
+                    "echo hi mom",
+                    "'echo' 'hi dad'",
+                    "'echo' 'hi' 'sis'",
+                    "",
+                ]
+            ),
+            util.shellify(
+                ["echo hi mom", ["echo", "hi dad"], ('echo', 'hi', 'sis')]
+            ),
+        )
+
+    def test_supports_comments(self):
+        self.assertEqual(
+            '\n'.join(["#!/bin/sh", "echo start", "echo end", ""]),
+            util.shellify(["echo start", None, "echo end"]),
+        )
+
+
+class TestGetHostnameFqdn(CiTestCase):
+    def test_get_hostname_fqdn_from_only_cfg_fqdn(self):
+        """When cfg only has the fqdn key, derive hostname and fqdn from it."""
+        hostname, fqdn = util.get_hostname_fqdn(
+            cfg={'fqdn': 'myhost.domain.com'}, cloud=None
+        )
+        self.assertEqual('myhost', hostname)
+        self.assertEqual('myhost.domain.com', fqdn)
+
+    def test_get_hostname_fqdn_from_cfg_fqdn_and_hostname(self):
+        """When cfg has both fqdn and hostname keys, return them."""
+        hostname, fqdn = util.get_hostname_fqdn(
+            cfg={'fqdn': 'myhost.domain.com', 'hostname': 'other'}, cloud=None
+        )
+        self.assertEqual('other', hostname)
+        self.assertEqual('myhost.domain.com', fqdn)
+
+    def test_get_hostname_fqdn_from_cfg_hostname_with_domain(self):
+        """When cfg has only hostname key which represents a fqdn, use that."""
+        hostname, fqdn = util.get_hostname_fqdn(
+            cfg={'hostname': 'myhost.domain.com'}, cloud=None
+        )
+        self.assertEqual('myhost', hostname)
+        self.assertEqual('myhost.domain.com', fqdn)
+
+    def test_get_hostname_fqdn_from_cfg_hostname_without_domain(self):
+        """When cfg has a hostname without a '.' query cloud.get_hostname."""
+        mycloud = FakeCloud('cloudhost', 'cloudhost.mycloud.com')
+        hostname, fqdn = util.get_hostname_fqdn(
+            cfg={'hostname': 'myhost'}, cloud=mycloud
+        )
+        self.assertEqual('myhost', hostname)
+        self.assertEqual('cloudhost.mycloud.com', fqdn)
+        self.assertEqual(
+            [{'fqdn': True, 'metadata_only': False}], mycloud.calls
+        )
+
+    def test_get_hostname_fqdn_from_without_fqdn_or_hostname(self):
+        """When cfg has neither hostname nor fqdn cloud.get_hostname."""
+        mycloud = FakeCloud('cloudhost', 'cloudhost.mycloud.com')
+        hostname, fqdn = util.get_hostname_fqdn(cfg={}, cloud=mycloud)
+        self.assertEqual('cloudhost', hostname)
+        self.assertEqual('cloudhost.mycloud.com', fqdn)
+        self.assertEqual(
+            [{'fqdn': True, 'metadata_only': False}, {'metadata_only': False}],
+            mycloud.calls,
+        )
+
+    def test_get_hostname_fqdn_from_passes_metadata_only_to_cloud(self):
+        """Calls to cloud.get_hostname pass the metadata_only parameter."""
+        mycloud = FakeCloud('cloudhost', 'cloudhost.mycloud.com')
+        _hn, _fqdn = util.get_hostname_fqdn(
+            cfg={}, cloud=mycloud, metadata_only=True
+        )
+        self.assertEqual(
+            [{'fqdn': True, 'metadata_only': True}, {'metadata_only': True}],
+            mycloud.calls,
+        )
+
+
+class TestBlkid(CiTestCase):
+    ids = {
+        "id01": "1111-1111",
+        "id02": "22222222-2222",
+        "id03": "33333333-3333",
+        "id04": "44444444-4444",
+        "id05": "55555555-5555-5555-5555-555555555555",
+        "id06": "66666666-6666-6666-6666-666666666666",
+        "id07": "52894610484658920398",
+        "id08": "86753098675309867530",
+        "id09": "99999999-9999-9999-9999-999999999999",
+    }
+
+    blkid_out = dedent(
+        """\
+        /dev/loop0: TYPE="squashfs"
+        /dev/loop1: TYPE="squashfs"
+        /dev/loop2: TYPE="squashfs"
+        /dev/loop3: TYPE="squashfs"
+        /dev/sda1: UUID="{id01}" TYPE="vfat" PARTUUID="{id02}"
+        /dev/sda2: UUID="{id03}" TYPE="ext4" PARTUUID="{id04}"
+        /dev/sda3: UUID="{id05}" TYPE="ext4" PARTUUID="{id06}"
+        /dev/sda4: LABEL="default" UUID="{id07}" UUID_SUB="{id08}" """
+        """TYPE="zfs_member" PARTUUID="{id09}"
+        /dev/loop4: TYPE="squashfs"
+      """
+    )
+
+    maxDiff = None
+
+    def _get_expected(self):
+        return {
+            "/dev/loop0": {"DEVNAME": "/dev/loop0", "TYPE": "squashfs"},
+            "/dev/loop1": {"DEVNAME": "/dev/loop1", "TYPE": "squashfs"},
+            "/dev/loop2": {"DEVNAME": "/dev/loop2", "TYPE": "squashfs"},
+            "/dev/loop3": {"DEVNAME": "/dev/loop3", "TYPE": "squashfs"},
+            "/dev/loop4": {"DEVNAME": "/dev/loop4", "TYPE": "squashfs"},
+            "/dev/sda1": {
+                "DEVNAME": "/dev/sda1",
+                "TYPE": "vfat",
+                "UUID": self.ids["id01"],
+                "PARTUUID": self.ids["id02"],
+            },
+            "/dev/sda2": {
+                "DEVNAME": "/dev/sda2",
+                "TYPE": "ext4",
+                "UUID": self.ids["id03"],
+                "PARTUUID": self.ids["id04"],
+            },
+            "/dev/sda3": {
+                "DEVNAME": "/dev/sda3",
+                "TYPE": "ext4",
+                "UUID": self.ids["id05"],
+                "PARTUUID": self.ids["id06"],
+            },
+            "/dev/sda4": {
+                "DEVNAME": "/dev/sda4",
+                "TYPE": "zfs_member",
+                "LABEL": "default",
+                "UUID": self.ids["id07"],
+                "UUID_SUB": self.ids["id08"],
+                "PARTUUID": self.ids["id09"],
+            },
+        }
+
+    @mock.patch("cloudinit.subp.subp")
+    def test_functional_blkid(self, m_subp):
+        m_subp.return_value = (self.blkid_out.format(**self.ids), "")
+        self.assertEqual(self._get_expected(), util.blkid())
+        m_subp.assert_called_with(
+            ["blkid", "-o", "full"], capture=True, decode="replace"
+        )
+
+    @mock.patch("cloudinit.subp.subp")
+    def test_blkid_no_cache_uses_no_cache(self, m_subp):
+        """blkid should turn off cache if disable_cache is true."""
+        m_subp.return_value = (self.blkid_out.format(**self.ids), "")
+        self.assertEqual(self._get_expected(), util.blkid(disable_cache=True))
+        m_subp.assert_called_with(
+            ["blkid", "-o", "full", "-c", "/dev/null"],
+            capture=True,
+            decode="replace",
+        )
+
+
+@mock.patch('cloudinit.subp.subp')
+class TestUdevadmSettle(CiTestCase):
+    def test_with_no_params(self, m_subp):
+        """called with no parameters."""
+        util.udevadm_settle()
+        m_subp.called_once_with(mock.call(['udevadm', 'settle']))
+
+    def test_with_exists_and_not_exists(self, m_subp):
+        """with exists=file where file does not exist should invoke subp."""
+        mydev = self.tmp_path("mydev")
+        util.udevadm_settle(exists=mydev)
+        m_subp.called_once_with(
+            ['udevadm', 'settle', '--exit-if-exists=%s' % mydev]
+        )
+
+    def test_with_exists_and_file_exists(self, m_subp):
+        """with exists=file where file does exist should not invoke subp."""
+        mydev = self.tmp_path("mydev")
+        util.write_file(mydev, "foo\n")
+        util.udevadm_settle(exists=mydev)
+        self.assertIsNone(m_subp.call_args)
+
+    def test_with_timeout_int(self, m_subp):
+        """timeout can be an integer."""
+        timeout = 9
+        util.udevadm_settle(timeout=timeout)
+        m_subp.called_once_with(
+            ['udevadm', 'settle', '--timeout=%s' % timeout]
+        )
+
+    def test_with_timeout_string(self, m_subp):
+        """timeout can be a string."""
+        timeout = "555"
+        util.udevadm_settle(timeout=timeout)
+        m_subp.assert_called_once_with(
+            ['udevadm', 'settle', '--timeout=%s' % timeout]
+        )
+
+    def test_with_exists_and_timeout(self, m_subp):
+        """test call with both exists and timeout."""
+        mydev = self.tmp_path("mydev")
+        timeout = "3"
+        util.udevadm_settle(exists=mydev)
+        m_subp.called_once_with(
+            [
+                'udevadm',
+                'settle',
+                '--exit-if-exists=%s' % mydev,
+                '--timeout=%s' % timeout,
+            ]
+        )
+
+    def test_subp_exception_raises_to_caller(self, m_subp):
+        m_subp.side_effect = subp.ProcessExecutionError("BOOM")
+        self.assertRaises(subp.ProcessExecutionError, util.udevadm_settle)
+
+
+@mock.patch('os.path.exists')
+class TestGetLinuxDistro(CiTestCase):
+    def setUp(self):
+        # python2 has no lru_cache, and therefore, no cache_clear()
+        if hasattr(util.get_linux_distro, "cache_clear"):
+            util.get_linux_distro.cache_clear()
+
+    @classmethod
+    def os_release_exists(self, path):
+        """Side effect function"""
+        if path == '/etc/os-release':
+            return 1
+
+    @classmethod
+    def redhat_release_exists(self, path):
+        """Side effect function"""
+        if path == '/etc/redhat-release':
+            return 1
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_distro_quoted_name(self, m_os_release, m_path_exists):
+        """Verify we get the correct name if the os-release file has
+        the distro name in quotes"""
+        m_os_release.return_value = OS_RELEASE_SLES
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('sles', '12.3', platform.machine()), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_distro_bare_name(self, m_os_release, m_path_exists):
+        """Verify we get the correct name if the os-release file does not
+        have the distro name in quotes"""
+        m_os_release.return_value = OS_RELEASE_UBUNTU
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('ubuntu', '16.04', 'xenial'), dist)
+
+    @mock.patch('platform.system')
+    @mock.patch('platform.release')
+    @mock.patch('cloudinit.util._parse_redhat_release')
+    def test_get_linux_freebsd(
+        self,
+        m_parse_redhat_release,
+        m_platform_release,
+        m_platform_system,
+        m_path_exists,
+    ):
+        """Verify we get the correct name and release name on FreeBSD."""
+        m_path_exists.return_value = False
+        m_platform_release.return_value = '12.0-RELEASE-p10'
+        m_platform_system.return_value = 'FreeBSD'
+        m_parse_redhat_release.return_value = {}
+        util.is_BSD.cache_clear()
+        dist = util.get_linux_distro()
+        self.assertEqual(('freebsd', '12.0-RELEASE-p10', ''), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_centos6(self, m_os_release, m_path_exists):
+        """Verify we get the correct name and release name on CentOS 6."""
+        m_os_release.return_value = REDHAT_RELEASE_CENTOS_6
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('centos', '6.10', 'Final'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_centos7_redhat_release(self, m_os_release, m_exists):
+        """Verify the correct release info on CentOS 7 without os-release."""
+        m_os_release.return_value = REDHAT_RELEASE_CENTOS_7
+        m_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('centos', '7.5.1804', 'Core'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_redhat7_osrelease(self, m_os_release, m_path_exists):
+        """Verify redhat 7 read from os-release."""
+        m_os_release.return_value = OS_RELEASE_REDHAT_7
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('redhat', '7.5', 'Maipo'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_redhat7_rhrelease(self, m_os_release, m_path_exists):
+        """Verify redhat 7 read from redhat-release."""
+        m_os_release.return_value = REDHAT_RELEASE_REDHAT_7
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('redhat', '7.5', 'Maipo'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_redhat6_rhrelease(self, m_os_release, m_path_exists):
+        """Verify redhat 6 read from redhat-release."""
+        m_os_release.return_value = REDHAT_RELEASE_REDHAT_6
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('redhat', '6.10', 'Santiago'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_copr_centos(self, m_os_release, m_path_exists):
+        """Verify we get the correct name and release name on COPR CentOS."""
+        m_os_release.return_value = OS_RELEASE_CENTOS
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('centos', '7', 'Core'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_almalinux8_rhrelease(self, m_os_release, m_path_exists):
+        """Verify almalinux 8 read from redhat-release."""
+        m_os_release.return_value = REDHAT_RELEASE_ALMALINUX_8
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('almalinux', '8.3', 'Purple Manul'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_almalinux8_osrelease(self, m_os_release, m_path_exists):
+        """Verify almalinux 8 read from os-release."""
+        m_os_release.return_value = OS_RELEASE_ALMALINUX_8
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('almalinux', '8.3', 'Purple Manul'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_eurolinux7_rhrelease(self, m_os_release, m_path_exists):
+        """Verify eurolinux 7 read from redhat-release."""
+        m_os_release.return_value = REDHAT_RELEASE_EUROLINUX_7
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('eurolinux', '7.9', 'Minsk'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_eurolinux7_osrelease(self, m_os_release, m_path_exists):
+        """Verify eurolinux 7 read from os-release."""
+        m_os_release.return_value = OS_RELEASE_EUROLINUX_7
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('eurolinux', '7.9', 'Minsk'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_eurolinux8_rhrelease(self, m_os_release, m_path_exists):
+        """Verify eurolinux 8 read from redhat-release."""
+        m_os_release.return_value = REDHAT_RELEASE_EUROLINUX_8
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('eurolinux', '8.4', 'Vaduz'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_eurolinux8_osrelease(self, m_os_release, m_path_exists):
+        """Verify eurolinux 8 read from os-release."""
+        m_os_release.return_value = OS_RELEASE_EUROLINUX_8
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('eurolinux', '8.4', 'Vaduz'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_rocky8_rhrelease(self, m_os_release, m_path_exists):
+        """Verify rocky linux 8 read from redhat-release."""
+        m_os_release.return_value = REDHAT_RELEASE_ROCKY_8
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('rocky', '8.3', 'Green Obsidian'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_rocky8_osrelease(self, m_os_release, m_path_exists):
+        """Verify rocky linux 8 read from os-release."""
+        m_os_release.return_value = OS_RELEASE_ROCKY_8
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('rocky', '8.3', 'Green Obsidian'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_virtuozzo8_rhrelease(self, m_os_release, m_path_exists):
+        """Verify virtuozzo linux 8 read from redhat-release."""
+        m_os_release.return_value = REDHAT_RELEASE_VIRTUOZZO_8
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('virtuozzo', '8', 'Virtuozzo Linux'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_virtuozzo8_osrelease(self, m_os_release, m_path_exists):
+        """Verify virtuozzo linux 8 read from os-release."""
+        m_os_release.return_value = OS_RELEASE_VIRTUOZZO_8
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('virtuozzo', '8', 'Virtuozzo Linux'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_cloud8_rhrelease(self, m_os_release, m_path_exists):
+        """Verify cloudlinux 8 read from redhat-release."""
+        m_os_release.return_value = REDHAT_RELEASE_CLOUDLINUX_8
+        m_path_exists.side_effect = TestGetLinuxDistro.redhat_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('cloudlinux', '8.4', 'Valery Rozhdestvensky'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_cloud8_osrelease(self, m_os_release, m_path_exists):
+        """Verify cloudlinux 8 read from os-release."""
+        m_os_release.return_value = OS_RELEASE_CLOUDLINUX_8
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('cloudlinux', '8.4', 'Valery Rozhdestvensky'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_debian(self, m_os_release, m_path_exists):
+        """Verify we get the correct name and release name on Debian."""
+        m_os_release.return_value = OS_RELEASE_DEBIAN
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('debian', '9', 'stretch'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_openeuler(self, m_os_release, m_path_exists):
+        """Verify get the correct name and release name on Openeuler."""
+        m_os_release.return_value = OS_RELEASE_OPENEULER_20
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('openEuler', '20.03', 'LTS-SP2'), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_opensuse(self, m_os_release, m_path_exists):
+        """Verify we get the correct name and machine arch on openSUSE
+        prior to openSUSE Leap 15.
+        """
+        m_os_release.return_value = OS_RELEASE_OPENSUSE
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('opensuse', '42.3', platform.machine()), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_opensuse_l15(self, m_os_release, m_path_exists):
+        """Verify we get the correct name and machine arch on openSUSE
+        for openSUSE Leap 15.0 and later.
+        """
+        m_os_release.return_value = OS_RELEASE_OPENSUSE_L15
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('opensuse-leap', '15.0', platform.machine()), dist)
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_opensuse_tw(self, m_os_release, m_path_exists):
+        """Verify we get the correct name and machine arch on openSUSE
+        for openSUSE Tumbleweed
+        """
+        m_os_release.return_value = OS_RELEASE_OPENSUSE_TW
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(
+            ('opensuse-tumbleweed', '20180920', platform.machine()), dist
+        )
+
+    @mock.patch('cloudinit.util.load_file')
+    def test_get_linux_photon_os_release(self, m_os_release, m_path_exists):
+        """Verify we get the correct name and machine arch on PhotonOS"""
+        m_os_release.return_value = OS_RELEASE_PHOTON
+        m_path_exists.side_effect = TestGetLinuxDistro.os_release_exists
+        dist = util.get_linux_distro()
+        self.assertEqual(('photon', '4.0', 'VMware Photon OS/Linux'), dist)
+
+    @mock.patch('platform.system')
+    @mock.patch('platform.dist', create=True)
+    def test_get_linux_distro_no_data(
+        self, m_platform_dist, m_platform_system, m_path_exists
+    ):
+        """Verify we get no information if os-release does not exist"""
+        m_platform_dist.return_value = ('', '', '')
+        m_platform_system.return_value = "Linux"
+        m_path_exists.return_value = 0
+        dist = util.get_linux_distro()
+        self.assertEqual(('', '', ''), dist)
+
+    @mock.patch('platform.system')
+    @mock.patch('platform.dist', create=True)
+    def test_get_linux_distro_no_impl(
+        self, m_platform_dist, m_platform_system, m_path_exists
+    ):
+        """Verify we get an empty tuple when no information exists and
+        Exceptions are not propagated"""
+        m_platform_dist.side_effect = Exception()
+        m_platform_system.return_value = "Linux"
+        m_path_exists.return_value = 0
+        dist = util.get_linux_distro()
+        self.assertEqual(('', '', ''), dist)
+
+    @mock.patch('platform.system')
+    @mock.patch('platform.dist', create=True)
+    def test_get_linux_distro_plat_data(
+        self, m_platform_dist, m_platform_system, m_path_exists
+    ):
+        """Verify we get the correct platform information"""
+        m_platform_dist.return_value = ('foo', '1.1', 'aarch64')
+        m_platform_system.return_value = "Linux"
+        m_path_exists.return_value = 0
+        dist = util.get_linux_distro()
+        self.assertEqual(('foo', '1.1', 'aarch64'), dist)
+
+
+class TestGetVariant:
+    @pytest.mark.parametrize(
+        'info, expected_variant',
+        [
+            ({'system': 'Linux', 'dist': ('almalinux',)}, 'almalinux'),
+            ({'system': 'linux', 'dist': ('alpine',)}, 'alpine'),
+            ({'system': 'linux', 'dist': ('arch',)}, 'arch'),
+            ({'system': 'linux', 'dist': ('centos',)}, 'centos'),
+            ({'system': 'linux', 'dist': ('cloudlinux',)}, 'cloudlinux'),
+            ({'system': 'linux', 'dist': ('debian',)}, 'debian'),
+            ({'system': 'linux', 'dist': ('eurolinux',)}, 'eurolinux'),
+            ({'system': 'linux', 'dist': ('fedora',)}, 'fedora'),
+            ({'system': 'linux', 'dist': ('openEuler',)}, 'openeuler'),
+            ({'system': 'linux', 'dist': ('photon',)}, 'photon'),
+            ({'system': 'linux', 'dist': ('rhel',)}, 'rhel'),
+            ({'system': 'linux', 'dist': ('rocky',)}, 'rocky'),
+            ({'system': 'linux', 'dist': ('suse',)}, 'suse'),
+            ({'system': 'linux', 'dist': ('virtuozzo',)}, 'virtuozzo'),
+            ({'system': 'linux', 'dist': ('ubuntu',)}, 'ubuntu'),
+            ({'system': 'linux', 'dist': ('linuxmint',)}, 'ubuntu'),
+            ({'system': 'linux', 'dist': ('mint',)}, 'ubuntu'),
+            ({'system': 'linux', 'dist': ('redhat',)}, 'rhel'),
+            ({'system': 'linux', 'dist': ('opensuse',)}, 'suse'),
+            ({'system': 'linux', 'dist': ('opensuse-tumbleweed',)}, 'suse'),
+            ({'system': 'linux', 'dist': ('opensuse-leap',)}, 'suse'),
+            ({'system': 'linux', 'dist': ('sles',)}, 'suse'),
+            ({'system': 'linux', 'dist': ('sle_hpc',)}, 'suse'),
+            ({'system': 'linux', 'dist': ('my_distro',)}, 'linux'),
+            ({'system': 'Windows', 'dist': ('dontcare',)}, 'windows'),
+            ({'system': 'Darwin', 'dist': ('dontcare',)}, 'darwin'),
+            ({'system': 'Freebsd', 'dist': ('dontcare',)}, 'freebsd'),
+            ({'system': 'Netbsd', 'dist': ('dontcare',)}, 'netbsd'),
+            ({'system': 'Openbsd', 'dist': ('dontcare',)}, 'openbsd'),
+            ({'system': 'Dragonfly', 'dist': ('dontcare',)}, 'dragonfly'),
+        ],
+    )
+    def test_get_variant(self, info, expected_variant):
+        """Verify we get the correct variant name"""
+        assert util._get_variant(info) == expected_variant
+
+
+class TestJsonDumps(CiTestCase):
+    def test_is_str(self):
+        """json_dumps should return a string."""
+        self.assertTrue(isinstance(util.json_dumps({'abc': '123'}), str))
+
+    def test_utf8(self):
+        smiley = '\\ud83d\\ude03'
+        self.assertEqual(
+            {'smiley': smiley}, json.loads(util.json_dumps({'smiley': smiley}))
+        )
+
+    def test_non_utf8(self):
+        blob = b'\xba\x03Qx-#y\xea'
+        self.assertEqual(
+            {'blob': 'ci-b64:' + base64.b64encode(blob).decode('utf-8')},
+            json.loads(util.json_dumps({'blob': blob})),
+        )
+
+
+@mock.patch('os.path.exists')
+class TestIsLXD(CiTestCase):
+    def test_is_lxd_true_on_sock_device(self, m_exists):
+        """When lxd's /dev/lxd/sock exists, is_lxd returns true."""
+        m_exists.return_value = True
+        self.assertTrue(util.is_lxd())
+        m_exists.assert_called_once_with('/dev/lxd/sock')
 
+    def test_is_lxd_false_when_sock_device_absent(self, m_exists):
+        """When lxd's /dev/lxd/sock is absent, is_lxd returns false."""
+        m_exists.return_value = False
+        self.assertFalse(util.is_lxd())
+        m_exists.assert_called_once_with('/dev/lxd/sock')
+
+
+class TestReadCcFromCmdline:
+    @pytest.mark.parametrize(
+        "cmdline,expected_cfg",
+        [
+            # Return None if cmdline has no cc:<YAML>end_cc content.
+            (CiTestCase.random_string(), None),
+            # Return None if YAML content is empty string.
+            ('foo cc: end_cc bar', None),
+            # Return expected dictionary without trailing end_cc marker.
+            ('foo cc: ssh_pwauth: true', {'ssh_pwauth': True}),
+            # Return expected dictionary w escaped newline and no end_cc.
+            ('foo cc: ssh_pwauth: true\\n', {'ssh_pwauth': True}),
+            # Return expected dictionary of yaml between cc: and end_cc.
+            ('foo cc: ssh_pwauth: true end_cc bar', {'ssh_pwauth': True}),
+            # Return dict with list value w escaped newline, no end_cc.
+            (
+                'cc: ssh_import_id: [smoser, kirkland]\\n',
+                {'ssh_import_id': ['smoser', 'kirkland']},
+            ),
+            # Parse urlencoded brackets in yaml content.
+            (
+                'cc: ssh_import_id: %5Bsmoser, kirkland%5D end_cc',
+                {'ssh_import_id': ['smoser', 'kirkland']},
+            ),
+            # Parse complete urlencoded yaml content.
+            (
+                'cc: ssh_import_id%3A%20%5Buser1%2C%20user2%5D end_cc',
+                {'ssh_import_id': ['user1', 'user2']},
+            ),
+            # Parse nested dictionary in yaml content.
+            (
+                'cc: ntp: {enabled: true, ntp_client: myclient} end_cc',
+                {'ntp': {'enabled': True, 'ntp_client': 'myclient'}},
+            ),
+            # Parse single mapping value in yaml content.
+            ('cc: ssh_import_id: smoser end_cc', {'ssh_import_id': 'smoser'}),
+            # Parse multiline content with multiple mapping and nested lists.
+            (
+                (
+                    'cc: ssh_import_id: [smoser, bob]\\n'
+                    'runcmd: [ [ ls, -l ], echo hi ] end_cc'
+                ),
+                {
+                    'ssh_import_id': ['smoser', 'bob'],
+                    'runcmd': [['ls', '-l'], 'echo hi'],
+                },
+            ),
+            # Parse multiline encoded content w/ mappings and nested lists.
+            (
+                (
+                    'cc: ssh_import_id: %5Bsmoser, bob%5D\\n'
+                    'runcmd: [ [ ls, -l ], echo hi ] end_cc'
+                ),
+                {
+                    'ssh_import_id': ['smoser', 'bob'],
+                    'runcmd': [['ls', '-l'], 'echo hi'],
+                },
+            ),
+            # test encoded escaped newlines work.
+            #
+            # unquote(encoded_content)
+            # 'ssh_import_id: [smoser, bob]\\nruncmd: [ [ ls, -l ], echo hi ]'
+            (
+                (
+                    'cc: '
+                    + (
+                        'ssh_import_id%3A%20%5Bsmoser%2C%20bob%5D%5Cn'
+                        'runcmd%3A%20%5B%20%5B%20ls%2C%20-l%20%5D%2C'
+                        '%20echo%20hi%20%5D'
+                    )
+                    + ' end_cc'
+                ),
+                {
+                    'ssh_import_id': ['smoser', 'bob'],
+                    'runcmd': [['ls', '-l'], 'echo hi'],
+                },
+            ),
+            # test encoded newlines work.
+            #
+            # unquote(encoded_content)
+            # 'ssh_import_id: [smoser, bob]\nruncmd: [ [ ls, -l ], echo hi ]'
+            (
+                (
+                    "cc: "
+                    + (
+                        'ssh_import_id%3A%20%5Bsmoser%2C%20bob%5D%0A'
+                        'runcmd%3A%20%5B%20%5B%20ls%2C%20-l%20%5D%2C'
+                        '%20echo%20hi%20%5D'
+                    )
+                    + ' end_cc'
+                ),
+                {
+                    'ssh_import_id': ['smoser', 'bob'],
+                    'runcmd': [['ls', '-l'], 'echo hi'],
+                },
+            ),
+            # Parse and merge multiple yaml content sections.
+            (
+                (
+                    'cc:ssh_import_id: [smoser, bob] end_cc '
+                    'cc: runcmd: [ [ ls, -l ] ] end_cc'
+                ),
+                {'ssh_import_id': ['smoser', 'bob'], 'runcmd': [['ls', '-l']]},
+            ),
+            # Parse and merge multiple encoded yaml content sections.
+            (
+                (
+                    'cc:ssh_import_id%3A%20%5Bsmoser%5D end_cc '
+                    'cc:runcmd%3A%20%5B%20%5B%20ls%2C%20-l%20%5D%20%5D end_cc'
+                ),
+                {'ssh_import_id': ['smoser'], 'runcmd': [['ls', '-l']]},
+            ),
+        ],
+    )
+    def test_read_conf_from_cmdline_config(self, expected_cfg, cmdline):
+        assert expected_cfg == util.read_conf_from_cmdline(cmdline=cmdline)
+
+
+class TestMountCb:
+    """Tests for ``util.mount_cb``.
+
+    These tests consider the "unit" under test to be ``util.mount_cb`` and
+    ``util.unmounter``, which is only used by ``mount_cb``.
+
+    TODO: Test default mtype determination
+    TODO: Test the if/else branch that actually performs the mounting operation
+    """
+
+    @pytest.yield_fixture
+    def already_mounted_device_and_mountdict(self):
+        """Mock an already-mounted device, and yield (device, mount dict)"""
+        device = "/dev/fake0"
+        mountpoint = "/mnt/fake"
+        with mock.patch("cloudinit.util.subp.subp"):
+            with mock.patch("cloudinit.util.mounts") as m_mounts:
+                mounts = {device: {"mountpoint": mountpoint}}
+                m_mounts.return_value = mounts
+                yield device, mounts[device]
+
+    @pytest.fixture
+    def already_mounted_device(self, already_mounted_device_and_mountdict):
+        """already_mounted_device_and_mountdict, but return only the device"""
+        return already_mounted_device_and_mountdict[0]
+
+    @pytest.mark.parametrize(
+        "mtype,expected",
+        [
+            # While the filesystem is called iso9660, the mount type is cd9660
+            ("iso9660", "cd9660"),
+            # vfat is generally called "msdos" on BSD
+            ("vfat", "msdos"),
+            # judging from man pages, only FreeBSD has this alias
+            ("msdosfs", "msdos"),
+            # Test happy path
+            ("ufs", "ufs"),
+        ],
+    )
+    @mock.patch("cloudinit.util.is_Linux", autospec=True)
+    @mock.patch("cloudinit.util.is_BSD", autospec=True)
+    @mock.patch("cloudinit.util.subp.subp")
+    @mock.patch("cloudinit.temp_utils.tempdir", autospec=True)
+    def test_normalize_mtype_on_bsd(
+        self, m_tmpdir, m_subp, m_is_BSD, m_is_Linux, mtype, expected
+    ):
+        m_is_BSD.return_value = True
+        m_is_Linux.return_value = False
+        m_tmpdir.return_value.__enter__ = mock.Mock(
+            autospec=True, return_value="/tmp/fake"
+        )
+        m_tmpdir.return_value.__exit__ = mock.Mock(
+            autospec=True, return_value=True
+        )
+        callback = mock.Mock(autospec=True)
+
+        util.mount_cb('/dev/fake0', callback, mtype=mtype)
+        assert (
+            mock.call(
+                [
+                    "mount",
+                    "-o",
+                    "ro",
+                    "-t",
+                    expected,
+                    "/dev/fake0",
+                    "/tmp/fake",
+                ],
+                update_env=None,
+            )
+            in m_subp.call_args_list
+        )
+
+    @pytest.mark.parametrize("invalid_mtype", [int(0), float(0.0), dict()])
+    def test_typeerror_raised_for_invalid_mtype(self, invalid_mtype):
+        with pytest.raises(TypeError):
+            util.mount_cb(mock.Mock(), mock.Mock(), mtype=invalid_mtype)
+
+    @mock.patch("cloudinit.util.subp.subp")
+    def test_already_mounted_does_not_mount_or_umount_anything(
+        self, m_subp, already_mounted_device
+    ):
+        util.mount_cb(already_mounted_device, mock.Mock())
+
+        assert 0 == m_subp.call_count
+
+    @pytest.mark.parametrize("trailing_slash_in_mounts", ["/", ""])
+    def test_already_mounted_calls_callback(
+        self, trailing_slash_in_mounts, already_mounted_device_and_mountdict
+    ):
+        device, mount_dict = already_mounted_device_and_mountdict
+        mountpoint = mount_dict["mountpoint"]
+        mount_dict["mountpoint"] += trailing_slash_in_mounts
+
+        callback = mock.Mock()
+        util.mount_cb(device, callback)
+
+        # The mountpoint passed to callback should always have a trailing
+        # slash, regardless of the input
+        assert [mock.call(mountpoint + "/")] == callback.call_args_list
+
+    def test_already_mounted_calls_callback_with_data(
+        self, already_mounted_device
+    ):
+        callback = mock.Mock()
+        util.mount_cb(
+            already_mounted_device, callback, data=mock.sentinel.data
+        )
+
+        assert [
+            mock.call(mock.ANY, mock.sentinel.data)
+        ] == callback.call_args_list
+
+
+@mock.patch("cloudinit.util.write_file")
+class TestEnsureFile:
+    """Tests for ``cloudinit.util.ensure_file``."""
+
+    def test_parameters_passed_through(self, m_write_file):
+        """Test the parameters in the signature are passed to write_file."""
+        util.ensure_file(
+            mock.sentinel.path,
+            mode=mock.sentinel.mode,
+            preserve_mode=mock.sentinel.preserve_mode,
+        )
+
+        assert 1 == m_write_file.call_count
+        args, kwargs = m_write_file.call_args
+        assert (mock.sentinel.path,) == args
+        assert mock.sentinel.mode == kwargs["mode"]
+        assert mock.sentinel.preserve_mode == kwargs["preserve_mode"]
+
+    @pytest.mark.parametrize(
+        "kwarg,expected",
+        [
+            # Files should be world-readable by default
+            ("mode", 0o644),
+            # The previous behaviour of not preserving mode should be retained
+            ("preserve_mode", False),
+        ],
+    )
+    def test_defaults(self, m_write_file, kwarg, expected):
+        """Test that ensure_file defaults appropriately."""
+        util.ensure_file(mock.sentinel.path)
+
+        assert 1 == m_write_file.call_count
+        _args, kwargs = m_write_file.call_args
+        assert expected == kwargs[kwarg]
+
+    def test_static_parameters_are_passed(self, m_write_file):
+        """Test that the static write_files parameters are passed correctly."""
+        util.ensure_file(mock.sentinel.path)
+
+        assert 1 == m_write_file.call_count
+        _args, kwargs = m_write_file.call_args
+        assert "" == kwargs["content"]
+        assert "ab" == kwargs["omode"]
+
+
+@mock.patch("cloudinit.util.grp.getgrnam")
+@mock.patch("cloudinit.util.os.setgid")
+@mock.patch("cloudinit.util.os.umask")
+class TestRedirectOutputPreexecFn:
+    """This tests specifically the preexec_fn used in redirect_output."""
+
+    @pytest.fixture(params=["outfmt", "errfmt"])
+    def preexec_fn(self, request):
+        """A fixture to gather the preexec_fn used by redirect_output.
+
+        This enables simpler direct testing of it, and parameterises any tests
+        using it to cover both the stdout and stderr code paths.
+        """
+        test_string = "| piped output to invoke subprocess"
+        if request.param == "outfmt":
+            args = (test_string, None)
+        elif request.param == "errfmt":
+            args = (None, test_string)
+        with mock.patch("cloudinit.util.subprocess.Popen") as m_popen:
+            util.redirect_output(*args)
+
+        assert 1 == m_popen.call_count
+        _args, kwargs = m_popen.call_args
+        assert "preexec_fn" in kwargs, "preexec_fn not passed to Popen"
+        return kwargs["preexec_fn"]
+
+    def test_preexec_fn_sets_umask(
+        self, m_os_umask, _m_setgid, _m_getgrnam, preexec_fn
+    ):
+        """preexec_fn should set a mask that avoids world-readable files."""
+        preexec_fn()
+
+        assert [mock.call(0o037)] == m_os_umask.call_args_list
+
+    def test_preexec_fn_sets_group_id_if_adm_group_present(
+        self, _m_os_umask, m_setgid, m_getgrnam, preexec_fn
+    ):
+        """We should setgrp to adm if present, so files are owned by them."""
+        fake_group = mock.Mock(gr_gid=mock.sentinel.gr_gid)
+        m_getgrnam.return_value = fake_group
+
+        preexec_fn()
+
+        assert [mock.call("adm")] == m_getgrnam.call_args_list
+        assert [mock.call(mock.sentinel.gr_gid)] == m_setgid.call_args_list
+
+    def test_preexec_fn_handles_absent_adm_group_gracefully(
+        self, _m_os_umask, m_setgid, m_getgrnam, preexec_fn
+    ):
+        """We should handle an absent adm group gracefully."""
+        m_getgrnam.side_effect = KeyError("getgrnam(): name not found: 'adm'")
+
+        preexec_fn()
+
+        assert 0 == m_setgid.call_count
+
+
+class FakeSelinux(object):
     def __init__(self, match_what):
         self.match_what = match_what
         self.restored = []
@@ -175,8 +1463,9 @@ class TestWriteFile(helpers.TestCase):
 
         fake_se = FakeSelinux(my_file)
 
-        with mock.patch.object(importer, 'import_module',
-                               return_value=fake_se) as mockobj:
+        with mock.patch.object(
+            importer, 'import_module', return_value=fake_se
+        ) as mockobj:
             with util.SeLinuxGuard(my_file) as is_on:
                 self.assertTrue(is_on)
 
@@ -261,8 +1550,9 @@ class TestKeyValStrings(helpers.TestCase):
 
 class TestGetCmdline(helpers.TestCase):
     def test_cmdline_reads_debug_env(self):
-        with mock.patch.dict("os.environ",
-                             values={'DEBUG_PROC_CMDLINE': 'abcd 123'}):
+        with mock.patch.dict(
+            "os.environ", values={'DEBUG_PROC_CMDLINE': 'abcd 123'}
+        ):
             ret = util.get_cmdline()
         self.assertEqual("abcd 123", ret)
 
@@ -279,52 +1569,68 @@ class TestLoadYaml(helpers.CiTestCase):
         '''Any unallowed types result in returning default; log the issue.'''
         # for now, anything not in the allowed list just returns the default.
         myyaml = yaml.dump({'1': "one"})
-        self.assertEqual(util.load_yaml(blob=myyaml,
-                                        default=self.mydefault,
-                                        allowed=(str,)),
-                         self.mydefault)
+        self.assertEqual(
+            util.load_yaml(
+                blob=myyaml, default=self.mydefault, allowed=(str,)
+            ),
+            self.mydefault,
+        )
         regex = re.compile(
             r'Yaml load allows \(<(class|type) \'str\'>,\) root types, but'
-            r' got dict')
-        self.assertTrue(regex.search(self.logs.getvalue()),
-                        msg='Missing expected yaml load error')
+            r' got dict'
+        )
+        self.assertTrue(
+            regex.search(self.logs.getvalue()),
+            msg='Missing expected yaml load error',
+        )
 
     def test_bogus_scan_error_returns_default(self):
         '''On Yaml scan error, load_yaml returns the default and logs issue.'''
         badyaml = "1\n 2:"
-        self.assertEqual(util.load_yaml(blob=badyaml,
-                                        default=self.mydefault),
-                         self.mydefault)
+        self.assertEqual(
+            util.load_yaml(blob=badyaml, default=self.mydefault),
+            self.mydefault,
+        )
         self.assertIn(
             'Failed loading yaml blob. Invalid format at line 2 column 3:'
             ' "mapping values are not allowed here',
-            self.logs.getvalue())
+            self.logs.getvalue(),
+        )
 
     def test_bogus_parse_error_returns_default(self):
         '''On Yaml parse error, load_yaml returns default and logs issue.'''
         badyaml = "{}}"
-        self.assertEqual(util.load_yaml(blob=badyaml,
-                                        default=self.mydefault),
-                         self.mydefault)
+        self.assertEqual(
+            util.load_yaml(blob=badyaml, default=self.mydefault),
+            self.mydefault,
+        )
         self.assertIn(
             'Failed loading yaml blob. Invalid format at line 1 column 3:'
             " \"expected \'<document start>\', but found \'}\'",
-            self.logs.getvalue())
+            self.logs.getvalue(),
+        )
 
     def test_unsafe_types(self):
         # should not load complex types
-        unsafe_yaml = yaml.dump((1, 2, 3,))
-        self.assertEqual(util.load_yaml(blob=unsafe_yaml,
-                                        default=self.mydefault),
-                         self.mydefault)
+        unsafe_yaml = yaml.dump(
+            (
+                1,
+                2,
+                3,
+            )
+        )
+        self.assertEqual(
+            util.load_yaml(blob=unsafe_yaml, default=self.mydefault),
+            self.mydefault,
+        )
 
     def test_python_unicode(self):
         # complex type of python/unicode is explicitly allowed
         myobj = {'1': "FOOBAR"}
         safe_yaml = yaml.dump(myobj)
-        self.assertEqual(util.load_yaml(blob=safe_yaml,
-                                        default=self.mydefault),
-                         myobj)
+        self.assertEqual(
+            util.load_yaml(blob=safe_yaml, default=self.mydefault), myobj
+        )
 
     def test_none_returns_default(self):
         """If yaml.load returns None, then default should be returned."""
@@ -332,13 +1638,16 @@ class TestLoadYaml(helpers.CiTestCase):
         mdef = self.mydefault
         self.assertEqual(
             [(b, self.mydefault) for b in blobs],
-            [(b, util.load_yaml(blob=b, default=mdef)) for b in blobs])
+            [(b, util.load_yaml(blob=b, default=mdef)) for b in blobs],
+        )
 
 
 class TestMountinfoParsing(helpers.ResourceUsingTestCase):
     def test_invalid_mountinfo(self):
-        line = ("20 1 252:1 / / rw,relatime - ext4 /dev/mapper/vg0-root"
-                "rw,errors=remount-ro,data=ordered")
+        line = (
+            "20 1 252:1 / / rw,relatime - ext4 /dev/mapper/vg0-root"
+            "rw,errors=remount-ro,data=ordered"
+        )
         elements = line.split()
         for i in range(len(elements) + 1):
             lines = [' '.join(elements[0:i])]
@@ -398,7 +1707,8 @@ class TestMountinfoParsing(helpers.ResourceUsingTestCase):
         m_os.path.exists.return_value = True
         # mock subp command from util.get_mount_info_fs_on_zpool
         zpool_output.return_value = (
-            helpers.readResource('zpool_status_simple.txt'), ''
+            helpers.readResource('zpool_status_simple.txt'),
+            '',
         )
         # save function return values and do asserts
         ret = util.get_device_info_from_zpool('vmzroot')
@@ -431,7 +1741,8 @@ class TestMountinfoParsing(helpers.ResourceUsingTestCase):
         m_os.path.exists.return_value = True
         # mock subp command from util.get_mount_info_fs_on_zpool
         zpool_output.return_value = (
-            helpers.readResource('zpool_status_simple.txt'), 'error'
+            helpers.readResource('zpool_status_simple.txt'),
+            'error',
         )
         # save function return values and do asserts
         ret = util.get_device_info_from_zpool('vmzroot')
@@ -440,7 +1751,9 @@ class TestMountinfoParsing(helpers.ResourceUsingTestCase):
     @mock.patch('cloudinit.subp.subp')
     def test_parse_mount_with_ext(self, mount_out):
         mount_out.return_value = (
-            helpers.readResource('mount_parse_ext.txt'), '')
+            helpers.readResource('mount_parse_ext.txt'),
+            '',
+        )
         # this one is valid and exists in mount_parse_ext.txt
         ret = util.parse_mount('/var')
         self.assertEqual(('/dev/mapper/vg00-lv_var', 'ext4', '/var'), ret)
@@ -457,7 +1770,9 @@ class TestMountinfoParsing(helpers.ResourceUsingTestCase):
     @mock.patch('cloudinit.subp.subp')
     def test_parse_mount_with_zfs(self, mount_out):
         mount_out.return_value = (
-            helpers.readResource('mount_parse_zfs.txt'), '')
+            helpers.readResource('mount_parse_zfs.txt'),
+            '',
+        )
         # this one is valid and exists in mount_parse_zfs.txt
         ret = util.parse_mount('/var')
         self.assertEqual(('vmzroot/ROOT/freebsd/var', 'zfs', '/var'), ret)
@@ -470,20 +1785,21 @@ class TestMountinfoParsing(helpers.ResourceUsingTestCase):
 
 
 class TestIsX86(helpers.CiTestCase):
-
     def test_is_x86_matches_x86_types(self):
         """is_x86 returns True if CPU architecture matches."""
         matched_arches = ['x86_64', 'i386', 'i586', 'i686']
         for arch in matched_arches:
             self.assertTrue(
-                util.is_x86(arch), 'Expected is_x86 for arch "%s"' % arch)
+                util.is_x86(arch), 'Expected is_x86 for arch "%s"' % arch
+            )
 
     def test_is_x86_unmatched_types(self):
         """is_x86 returns Fale on non-intel x86 architectures."""
         unmatched_arches = ['ia64', '9000/800', 'arm64v71']
         for arch in unmatched_arches:
             self.assertFalse(
-                util.is_x86(arch), 'Expected not is_x86 for arch "%s"' % arch)
+                util.is_x86(arch), 'Expected not is_x86 for arch "%s"' % arch
+            )
 
     @mock.patch('cloudinit.util.os.uname')
     def test_is_x86_calls_uname_for_architecture(self, m_uname):
@@ -493,7 +1809,6 @@ class TestIsX86(helpers.CiTestCase):
 
 
 class TestGetConfigLogfiles(helpers.CiTestCase):
-
     def test_empty_cfg_returns_empty_list(self):
         """An empty config passed to get_config_logfiles returns empty list."""
         self.assertEqual([], util.get_config_logfiles(None))
@@ -502,36 +1817,53 @@ class TestGetConfigLogfiles(helpers.CiTestCase):
     def test_default_log_file_present(self):
         """When default_log_file is set get_config_logfiles finds it."""
         self.assertEqual(
-            ['/my.log'],
-            util.get_config_logfiles({'def_log_file': '/my.log'}))
+            ['/my.log'], util.get_config_logfiles({'def_log_file': '/my.log'})
+        )
 
     def test_output_logs_parsed_when_teeing_files(self):
         """When output configuration is parsed when teeing files."""
         self.assertEqual(
             ['/himom.log', '/my.log'],
-            sorted(util.get_config_logfiles({
-                'def_log_file': '/my.log',
-                'output': {'all': '|tee -a /himom.log'}})))
+            sorted(
+                util.get_config_logfiles(
+                    {
+                        'def_log_file': '/my.log',
+                        'output': {'all': '|tee -a /himom.log'},
+                    }
+                )
+            ),
+        )
 
     def test_output_logs_parsed_when_redirecting(self):
         """When output configuration is parsed when redirecting to a file."""
         self.assertEqual(
             ['/my.log', '/test.log'],
-            sorted(util.get_config_logfiles({
-                'def_log_file': '/my.log',
-                'output': {'all': '>/test.log'}})))
+            sorted(
+                util.get_config_logfiles(
+                    {
+                        'def_log_file': '/my.log',
+                        'output': {'all': '>/test.log'},
+                    }
+                )
+            ),
+        )
 
     def test_output_logs_parsed_when_appending(self):
         """When output configuration is parsed when appending to a file."""
         self.assertEqual(
             ['/my.log', '/test.log'],
-            sorted(util.get_config_logfiles({
-                'def_log_file': '/my.log',
-                'output': {'all': '>> /test.log'}})))
+            sorted(
+                util.get_config_logfiles(
+                    {
+                        'def_log_file': '/my.log',
+                        'output': {'all': '>> /test.log'},
+                    }
+                )
+            ),
+        )
 
 
 class TestMultiLog(helpers.FilesystemMockingTestCase):
-
     def _createConsole(self, root):
         os.mkdir(os.path.join(root, 'dev'))
         open(os.path.join(root, 'dev', 'console'), 'a').close()
@@ -580,8 +1912,9 @@ class TestMultiLog(helpers.FilesystemMockingTestCase):
         log = mock.MagicMock()
         logged_string = 'something very important'
         util.multi_log(logged_string, log=log)
-        self.assertEqual([((mock.ANY, logged_string), {})],
-                         log.log.call_args_list)
+        self.assertEqual(
+            [((mock.ANY, logged_string), {})], log.log.call_args_list
+        )
 
     def test_newlines_stripped_from_log_call(self):
         log = mock.MagicMock()
@@ -602,7 +1935,6 @@ class TestMultiLog(helpers.FilesystemMockingTestCase):
 
 
 class TestMessageFromString(helpers.TestCase):
-
     def test_unicode_not_messed_up(self):
         roundtripped = util.message_from_string('\n').as_string()
         self.assertNotIn('\x00', roundtripped)
@@ -618,8 +1950,9 @@ class TestReadSeeded(helpers.TestCase):
         ud = b"userdatablob"
         vd = b"vendordatablob"
         helpers.populate_dir(
-            self.tmp, {'meta-data': "key1: val1", 'user-data': ud,
-                       'vendor-data': vd})
+            self.tmp,
+            {'meta-data': "key1: val1", 'user-data': ud, 'vendor-data': vd},
+        )
         sdir = self.tmp + os.path.sep
         (found_md, found_ud, found_vd) = util.read_seeded(sdir)
 
@@ -638,7 +1971,8 @@ class TestReadSeededWithoutVendorData(helpers.TestCase):
         ud = b"userdatablob"
         vd = None
         helpers.populate_dir(
-            self.tmp, {'meta-data': "key1: val1", 'user-data': ud})
+            self.tmp, {'meta-data': "key1: val1", 'user-data': ud}
+        )
         sdir = self.tmp + os.path.sep
         (found_md, found_ud, found_vd) = util.read_seeded(sdir)
 
@@ -649,6 +1983,7 @@ class TestReadSeededWithoutVendorData(helpers.TestCase):
 
 class TestEncode(helpers.TestCase):
     """Test the encoding functions"""
+
     def test_decode_binary_plain_text_with_hex(self):
         blob = 'BOOTABLE_FLAG=\x80init=/bin/systemd'
         text = util.decode_binary(blob)
@@ -657,12 +1992,14 @@ class TestEncode(helpers.TestCase):
 
 class TestProcessExecutionError(helpers.TestCase):
 
-    template = ('{description}\n'
-                'Command: {cmd}\n'
-                'Exit code: {exit_code}\n'
-                'Reason: {reason}\n'
-                'Stdout: {stdout}\n'
-                'Stderr: {stderr}')
+    template = (
+        '{description}\n'
+        'Command: {cmd}\n'
+        'Exit code: {exit_code}\n'
+        'Reason: {reason}\n'
+        'Stdout: {stdout}\n'
+        'Stderr: {stderr}'
+    )
     empty_attr = '-'
     empty_description = 'Unexpected error while running command.'
 
@@ -671,23 +2008,37 @@ class TestProcessExecutionError(helpers.TestCase):
         msg = 'abc\ndef'
         formatted = 'abc\n{0}def'.format(' ' * 4)
         self.assertEqual(error._indent_text(msg, indent_level=4), formatted)
-        self.assertEqual(error._indent_text(msg.encode(), indent_level=4),
-                         formatted.encode())
+        self.assertEqual(
+            error._indent_text(msg.encode(), indent_level=4),
+            formatted.encode(),
+        )
         self.assertIsInstance(
-            error._indent_text(msg.encode()), type(msg.encode()))
+            error._indent_text(msg.encode()), type(msg.encode())
+        )
 
     def test_pexec_error_type(self):
         self.assertIsInstance(subp.ProcessExecutionError(), IOError)
 
     def test_pexec_error_empty_msgs(self):
         error = subp.ProcessExecutionError()
-        self.assertTrue(all(attr == self.empty_attr for attr in
-                            (error.stderr, error.stdout, error.reason)))
+        self.assertTrue(
+            all(
+                attr == self.empty_attr
+                for attr in (error.stderr, error.stdout, error.reason)
+            )
+        )
         self.assertEqual(error.description, self.empty_description)
-        self.assertEqual(str(error), self.template.format(
-            description=self.empty_description, exit_code=self.empty_attr,
-            reason=self.empty_attr, stdout=self.empty_attr,
-            stderr=self.empty_attr, cmd=self.empty_attr))
+        self.assertEqual(
+            str(error),
+            self.template.format(
+                description=self.empty_description,
+                exit_code=self.empty_attr,
+                reason=self.empty_attr,
+                stdout=self.empty_attr,
+                stderr=self.empty_attr,
+                cmd=self.empty_attr,
+            ),
+        )
 
     def test_pexec_error_single_line_msgs(self):
         stdout_msg = 'out out'
@@ -695,33 +2046,46 @@ class TestProcessExecutionError(helpers.TestCase):
         cmd = 'test command'
         exit_code = 3
         error = subp.ProcessExecutionError(
-            stdout=stdout_msg, stderr=stderr_msg, exit_code=3, cmd=cmd)
-        self.assertEqual(str(error), self.template.format(
-            description=self.empty_description, stdout=stdout_msg,
-            stderr=stderr_msg, exit_code=str(exit_code),
-            reason=self.empty_attr, cmd=cmd))
+            stdout=stdout_msg, stderr=stderr_msg, exit_code=3, cmd=cmd
+        )
+        self.assertEqual(
+            str(error),
+            self.template.format(
+                description=self.empty_description,
+                stdout=stdout_msg,
+                stderr=stderr_msg,
+                exit_code=str(exit_code),
+                reason=self.empty_attr,
+                cmd=cmd,
+            ),
+        )
 
     def test_pexec_error_multi_line_msgs(self):
         # make sure bytes is converted handled properly when formatting
         stdout_msg = 'multi\nline\noutput message'.encode()
         stderr_msg = 'multi\nline\nerror message\n\n\n'
         error = subp.ProcessExecutionError(
-            stdout=stdout_msg, stderr=stderr_msg)
+            stdout=stdout_msg, stderr=stderr_msg
+        )
         self.assertEqual(
             str(error),
-            '\n'.join((
-                '{description}',
-                'Command: {empty_attr}',
-                'Exit code: {empty_attr}',
-                'Reason: {empty_attr}',
-                'Stdout: multi',
-                '        line',
-                '        output message',
-                'Stderr: multi',
-                '        line',
-                '        error message',
-            )).format(description=self.empty_description,
-                      empty_attr=self.empty_attr))
+            '\n'.join(
+                (
+                    '{description}',
+                    'Command: {empty_attr}',
+                    'Exit code: {empty_attr}',
+                    'Reason: {empty_attr}',
+                    'Stdout: multi',
+                    '        line',
+                    '        output message',
+                    'Stderr: multi',
+                    '        line',
+                    '        error message',
+                )
+            ).format(
+                description=self.empty_description, empty_attr=self.empty_attr
+            ),
+        )
 
 
 class TestSystemIsSnappy(helpers.FilesystemMockingTestCase):
@@ -758,7 +2122,8 @@ class TestSystemIsSnappy(helpers.FilesystemMockingTestCase):
             "BOOT_IMAGE=(loop)/kernel.img root=LABEL=writable "
             "snap_core=core_x1.snap snap_kernel=pc-kernel_x1.snap ro "
             "net.ifnames=0 init=/lib/systemd/systemd console=tty1 "
-            "console=ttyS0 panic=-1")
+            "console=ttyS0 panic=-1"
+        )
         m_cmdline.return_value = cmdline
         self.assertTrue(util.system_is_snappy())
         self.assertTrue(m_cmdline.call_count > 0)
@@ -777,8 +2142,7 @@ class TestSystemIsSnappy(helpers.FilesystemMockingTestCase):
         m_cmdline.return_value = 'root=/dev/sda'
         root_d = self.tmp_dir()
         content = '\n'.join(["[Foo]", "source = 'ubuntu-core'", ""])
-        helpers.populate_dir(
-            root_d, {'etc/system-image/channel.ini': content})
+        helpers.populate_dir(root_d, {'etc/system-image/channel.ini': content})
         self.reRoot(root_d)
         self.assertTrue(util.system_is_snappy())
 
@@ -788,7 +2152,8 @@ class TestSystemIsSnappy(helpers.FilesystemMockingTestCase):
         m_cmdline.return_value = 'root=/dev/sda'
         root_d = self.tmp_dir()
         helpers.populate_dir(
-            root_d, {'etc/system-image/config.d/my.file': "_unused"})
+            root_d, {'etc/system-image/config.d/my.file': "_unused"}
+        )
         self.reRoot(root_d)
         self.assertTrue(util.system_is_snappy())
 
@@ -798,18 +2163,24 @@ class TestLoadShellContent(helpers.TestCase):
         """Shell comments should be allowed in the content."""
         self.assertEqual(
             {'key1': 'val1', 'key2': 'val2', 'key3': 'val3 #tricky'},
-            util.load_shell_content('\n'.join([
-                "#top of file comment",
-                "key1=val1 #this is a comment",
-                "# second comment",
-                'key2="val2" # inlin comment'
-                '#badkey=wark',
-                'key3="val3 #tricky"',
-                ''])))
+            util.load_shell_content(
+                '\n'.join(
+                    [
+                        "#top of file comment",
+                        "key1=val1 #this is a comment",
+                        "# second comment",
+                        'key2="val2" # inlin comment#badkey=wark',
+                        'key3="val3 #tricky"',
+                        '',
+                    ]
+                )
+            ),
+        )
 
 
 class TestGetProcEnv(helpers.TestCase):
     """test get_proc_env."""
+
     null = b'\x00'
     simple1 = b'HOME=/'
     simple2 = b'PATH=/bin:/sbin'
@@ -824,14 +2195,19 @@ class TestGetProcEnv(helpers.TestCase):
     def test_non_utf8_in_environment(self, m_load_file):
         """env may have non utf-8 decodable content."""
         content = self.null.join(
-            (self.bootflag, self.simple1, self.simple2, self.mixed))
+            (self.bootflag, self.simple1, self.simple2, self.mixed)
+        )
         m_load_file.return_value = content
 
         self.assertEqual(
-            {'BOOTABLE_FLAG': self._val_decoded(self.bootflag),
-             'HOME': '/', 'PATH': '/bin:/sbin',
-             'MIXED': self._val_decoded(self.mixed)},
-            util.get_proc_env(1))
+            {
+                'BOOTABLE_FLAG': self._val_decoded(self.bootflag),
+                'HOME': '/',
+                'PATH': '/bin:/sbin',
+                'MIXED': self._val_decoded(self.mixed),
+            },
+            util.get_proc_env(1),
+        )
         self.assertEqual(1, m_load_file.call_count)
 
     @mock.patch("cloudinit.util.load_file")
@@ -843,7 +2219,8 @@ class TestGetProcEnv(helpers.TestCase):
 
         self.assertEqual(
             dict([t.split(b'=') for t in lines]),
-            util.get_proc_env(1, encoding=None))
+            util.get_proc_env(1, encoding=None),
+        )
         self.assertEqual(1, m_load_file.call_count)
 
     @mock.patch("cloudinit.util.load_file")
@@ -852,8 +2229,8 @@ class TestGetProcEnv(helpers.TestCase):
         content = self.null.join((self.simple1, self.simple2))
         m_load_file.return_value = content
         self.assertEqual(
-            {'HOME': '/', 'PATH': '/bin:/sbin'},
-            util.get_proc_env(1))
+            {'HOME': '/', 'PATH': '/bin:/sbin'}, util.get_proc_env(1)
+        )
         self.assertEqual(1, m_load_file.call_count)
 
     @mock.patch("cloudinit.util.load_file")
@@ -871,14 +2248,15 @@ class TestGetProcEnv(helpers.TestCase):
         self.assertEqual(my_ppid, util.get_proc_ppid(my_pid))
 
 
-class TestKernelVersion():
+class TestKernelVersion:
     """test kernel version function"""
 
     params = [
         ('5.6.19-300.fc32.x86_64', (5, 6)),
         ('4.15.0-101-generic', (4, 15)),
         ('3.10.0-1062.12.1.vz7.131.10', (3, 10)),
-        ('4.18.0-144.el8.x86_64', (4, 18))]
+        ('4.18.0-144.el8.x86_64', (4, 18)),
+    ]
 
     @mock.patch('os.uname')
     @pytest.mark.parametrize("uname_release,expected", params)
@@ -892,29 +2270,27 @@ class TestFindDevs:
     def test_find_devs_with(self, m_subp):
         m_subp.return_value = (
             '/dev/sda1: UUID="some-uuid" TYPE="ext4" PARTUUID="some-partid"',
-            ''
+            '',
         )
         devlist = util.find_devs_with()
         assert devlist == [
-            '/dev/sda1: UUID="some-uuid" TYPE="ext4" PARTUUID="some-partid"']
+            '/dev/sda1: UUID="some-uuid" TYPE="ext4" PARTUUID="some-partid"'
+        ]
 
         devlist = util.find_devs_with("LABEL_FATBOOT=A_LABEL")
         assert devlist == [
-            '/dev/sda1: UUID="some-uuid" TYPE="ext4" PARTUUID="some-partid"']
+            '/dev/sda1: UUID="some-uuid" TYPE="ext4" PARTUUID="some-partid"'
+        ]
 
     @mock.patch('cloudinit.subp.subp')
     def test_find_devs_with_openbsd(self, m_subp):
-        m_subp.return_value = (
-            'cd0:,sd0:630d98d32b5d3759,sd1:,fd0:', ''
-        )
+        m_subp.return_value = ('cd0:,sd0:630d98d32b5d3759,sd1:,fd0:', '')
         devlist = util.find_devs_with_openbsd()
         assert devlist == ['/dev/cd0a', '/dev/sd1i']
 
     @mock.patch('cloudinit.subp.subp')
     def test_find_devs_with_openbsd_with_criteria(self, m_subp):
-        m_subp.return_value = (
-            'cd0:,sd0:630d98d32b5d3759,sd1:,fd0:', ''
-        )
+        m_subp.return_value = ('cd0:,sd0:630d98d32b5d3759,sd1:,fd0:', '')
         devlist = util.find_devs_with_openbsd(criteria="TYPE=iso9660")
         assert devlist == ['/dev/cd0a']
 
@@ -923,7 +2299,8 @@ class TestFindDevs:
         assert devlist == ['/dev/cd0a', '/dev/sd1i']
 
     @pytest.mark.parametrize(
-        'criteria,expected_devlist', (
+        'criteria,expected_devlist',
+        (
             (None, ['/dev/msdosfs/EFISYS', '/dev/iso9660/config-2']),
             ('TYPE=iso9660', ['/dev/iso9660/config-2']),
             ('TYPE=vfat', ['/dev/msdosfs/EFISYS']),
@@ -940,19 +2317,23 @@ class TestFindDevs:
             elif pattern == "/dev/iso9660/*":
                 return iso9660
             raise Exception
+
         m_glob.side_effect = fake_glob
 
         devlist = util.find_devs_with_freebsd(criteria=criteria)
         assert devlist == expected_devlist
 
     @pytest.mark.parametrize(
-        'criteria,expected_devlist', (
+        'criteria,expected_devlist',
+        (
             (None, ['/dev/ld0', '/dev/dk0', '/dev/dk1', '/dev/cd0']),
             ('TYPE=iso9660', ['/dev/cd0']),
             ('TYPE=vfat', ["/dev/ld0", "/dev/dk0", "/dev/dk1"]),
-            ('LABEL_FATBOOT=A_LABEL',  # lp: #1841466
-             ['/dev/ld0', '/dev/dk0', '/dev/dk1', '/dev/cd0']),
-        )
+            (
+                'LABEL_FATBOOT=A_LABEL',  # lp: #1841466
+                ['/dev/ld0', '/dev/dk0', '/dev/dk1', '/dev/cd0'],
+            ),
+        ),
     )
     @mock.patch("cloudinit.subp.subp")
     def test_find_devs_with_netbsd(self, m_subp, criteria, expected_devlist):
@@ -1000,21 +2381,24 @@ class TestFindDevs:
         assert devlist == expected_devlist
 
     @pytest.mark.parametrize(
-        'criteria,expected_devlist', (
+        'criteria,expected_devlist',
+        (
             (None, ['/dev/vbd0', '/dev/cd0', '/dev/acd0']),
             ('TYPE=iso9660', ['/dev/cd0', '/dev/acd0']),
             ('TYPE=vfat', ['/dev/vbd0']),
-            ('LABEL_FATBOOT=A_LABEL',  # lp: #1841466
-             ['/dev/vbd0', '/dev/cd0', '/dev/acd0']),
-        )
+            (
+                'LABEL_FATBOOT=A_LABEL',  # lp: #1841466
+                ['/dev/vbd0', '/dev/cd0', '/dev/acd0'],
+            ),
+        ),
     )
     @mock.patch("cloudinit.subp.subp")
-    def test_find_devs_with_dragonflybsd(self, m_subp, criteria,
-                                         expected_devlist):
-        m_subp.return_value = (
-            'md2 md1 cd0 vbd0 acd0 vn3 vn2 vn1 vn0 md0', ''
-        )
+    def test_find_devs_with_dragonflybsd(
+        self, m_subp, criteria, expected_devlist
+    ):
+        m_subp.return_value = ('md2 md1 cd0 vbd0 acd0 vn3 vn2 vn1 vn0 md0', '')
         devlist = util.find_devs_with_dragonflybsd(criteria=criteria)
         assert devlist == expected_devlist
 
+
 # vi: ts=4 expandtab
diff --git a/cloudinit/tests/test_version.py b/tests/unittests/test_version.py
index 778a762c..ed66b09f 100644
--- a/cloudinit/tests/test_version.py
+++ b/tests/unittests/test_version.py
@@ -2,7 +2,7 @@
 
 from unittest import mock
 
-from cloudinit.tests.helpers import CiTestCase
+from tests.unittests.helpers import CiTestCase
 from cloudinit import version
 
 
diff --git a/tests/unittests/test_vmware/__init__.py b/tests/unittests/test_vmware/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/tests/unittests/test_vmware/__init__.py
+++ /dev/null
diff --git a/tests/unittests/util.py b/tests/unittests/util.py
index 383f5f5c..2204c28f 100644
--- a/tests/unittests/util.py
+++ b/tests/unittests/util.py
@@ -15,7 +15,7 @@ def get_cloud(distro=None, paths=None, sys_cfg=None, metadata=None):
     """
     paths = paths or helpers.Paths({})
     sys_cfg = sys_cfg or {}
-    cls = distros.fetch(distro) if distro else TestingDistro
+    cls = distros.fetch(distro) if distro else MockDistro
     mydist = cls(distro, sys_cfg, paths)
     myds = DataSourceTesting(sys_cfg, mydist, paths)
     if metadata:
@@ -49,14 +49,14 @@ class DataSourceTesting(DataSourceNone):
         return 'testing'
 
 
-class TestingDistro(distros.Distro):
-    # TestingDistro is here to test base Distro class implementations
+class MockDistro(distros.Distro):
+    # MockDistro is here to test base Distro class implementations
     def __init__(self, name="testingdistro", cfg=None, paths=None):
         if not cfg:
             cfg = {}
         if not paths:
             paths = {}
-        super(TestingDistro, self).__init__(name, cfg, paths)
+        super(MockDistro, self).__init__(name, cfg, paths)
 
     def install_packages(self, pkglist):
         pass
diff --git a/tox.ini b/tox.ini
index 874d3f20..ff888266 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = py3, xenial-dev, flake8, pylint
 recreate = True
 
 [testenv]
-commands = {envpython} -m pytest {posargs:tests/unittests cloudinit}
+commands = {envpython} -m pytest {posargs:tests/unittests}
 setenv =
     LC_ALL = en_US.utf-8
 passenv=
@@ -37,7 +37,7 @@ deps =
 commands = {envpython} -m pytest \
             --durations 10 \
             {posargs:--cov=cloudinit --cov-branch \
-            tests/unittests cloudinit}
+            tests/unittests}
 
 [testenv:py27]
 basepython = python2.7
@@ -86,7 +86,7 @@ deps =
 # [testenv:xenial-dev].  See the comment there for details.
 commands =
   python ./tools/pipremove jsonschema
-  python -m pytest {posargs:tests/unittests cloudinit}
+  python -m pytest {posargs:tests/unittests}
 basepython = python3
 deps =
     # Refer to the comment in [xenial-shared-deps] for details
@@ -104,7 +104,7 @@ deps =
 # changes here are reflected in [testenv:xenial].
 commands =
   python ./tools/pipremove jsonschema
-  python -m pytest {posargs:tests/unittests cloudinit}
+  python -m pytest {posargs:tests/unittests}
 basepython = {[testenv:xenial]basepython}
 deps =
     # Refer to the comment in [xenial-shared-deps] for details
@@ -163,7 +163,7 @@ setenv =
 
 [pytest]
 # TODO: s/--strict/--strict-markers/ once xenial support is dropped
-testpaths = cloudinit tests/unittests
+testpaths = tests/unittests
 addopts = --strict
 log_format = %(asctime)s %(levelname)-9s %(name)s:%(filename)s:%(lineno)d %(message)s
 log_date_format = %Y-%m-%d %H:%M:%S