diff --git a/cloudinit/conftest.py b/conftest.py
similarity index 100%
rename from cloudinit/conftest.py
rename to conftest.py
diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py
index de896a9ec66..7c859c8af17 100644
--- a/tests/unittests/test_datasource/test_opennebula.py
+++ b/tests/unittests/test_datasource/test_opennebula.py
@@ -9,6 +9,8 @@
 import pwd
 import unittest
 
+import pytest
+
 
 TEST_VARS = {
     'VAR1': 'single',
@@ -914,12 +916,14 @@ def test_multiple_nics(self):
         self.assertEqual(expected, net.gen_conf())
 
 
-class TestParseShellConfig(unittest.TestCase):
+class TestParseShellConfig:
+
+    @pytest.mark.parametrize('disable_subp_usage', ['bash'], indirect=True)
     def test_no_seconds(self):
         cfg = '\n'.join(["foo=bar", "SECONDS=2", "xx=foo"])
         # we could test 'sleep 2', but that would make the test run slower.
         ret = ds.parse_shell_config(cfg)
-        self.assertEqual(ret, {"foo": "bar", "xx": "foo"})
+        assert ret == {"foo": "bar", "xx": "foo"}
 
 
 def populate_context_dir(path, variables):
diff --git a/tests/unittests/test_render_cloudcfg.py b/tests/unittests/test_render_cloudcfg.py
index 393a78b16e5..696915a37bb 100644
--- a/tests/unittests/test_render_cloudcfg.py
+++ b/tests/unittests/test_render_cloudcfg.py
@@ -13,6 +13,7 @@
                    "netbsd", "openbsd", "rhel", "suse", "ubuntu", "unknown"]
 
 
+@pytest.mark.parametrize('disable_subp_usage', [sys.executable], indirect=True)
 class TestRenderCloudCfg:
 
     cmd = [sys.executable, os.path.realpath('tools/render-cloudcfg')]