diff --git a/tests/unit/module_utils/xenserver/conftest.py b/tests/unit/module_utils/xenserver/conftest.py
index fa2148ce86..12e79a1877 100644
--- a/tests/unit/module_utils/xenserver/conftest.py
+++ b/tests/unit/module_utils/xenserver/conftest.py
@@ -13,7 +13,7 @@ import os
 import json
 import pytest
 
-from ..FakeAnsibleModule import FakeAnsibleModule
+from .FakeAnsibleModule import FakeAnsibleModule
 from ansible.module_utils import six
 from mock import MagicMock
 
diff --git a/tests/unit/module_utils/xenserver/test_gather_vm_params_and_facts.py b/tests/unit/module_utils/xenserver/test_gather_vm_params_and_facts.py
index ace13d823b..e8b309b38c 100644
--- a/tests/unit/module_utils/xenserver/test_gather_vm_params_and_facts.py
+++ b/tests/unit/module_utils/xenserver/test_gather_vm_params_and_facts.py
@@ -9,7 +9,7 @@ __metaclass__ = type
 
 import pytest
 
-from ..common import testcase_bad_xenapi_refs
+from .common import testcase_bad_xenapi_refs
 
 
 testcase_gather_vm_params_and_facts = {
diff --git a/tests/unit/module_utils/xenserver/test_get_object_ref.py b/tests/unit/module_utils/xenserver/test_get_object_ref.py
index 71488580f7..267302a099 100644
--- a/tests/unit/module_utils/xenserver/test_get_object_ref.py
+++ b/tests/unit/module_utils/xenserver/test_get_object_ref.py
@@ -9,8 +9,8 @@ __metaclass__ = type
 
 import pytest
 
-from ..FakeAnsibleModule import FailJsonException
-from ..common import fake_xenapi_ref
+from .FakeAnsibleModule import FailJsonException
+from .common import fake_xenapi_ref
 
 
 def test_get_object_ref_xenapi_failure(mocker, fake_ansible_module, XenAPI, xenserver):
diff --git a/tests/unit/module_utils/xenserver/test_set_vm_power_state.py b/tests/unit/module_utils/xenserver/test_set_vm_power_state.py
index 8b6444620d..fddb84ed65 100644
--- a/tests/unit/module_utils/xenserver/test_set_vm_power_state.py
+++ b/tests/unit/module_utils/xenserver/test_set_vm_power_state.py
@@ -9,8 +9,8 @@ __metaclass__ = type
 
 import pytest
 
-from ..FakeAnsibleModule import FailJsonException
-from ..common import fake_xenapi_ref, testcase_bad_xenapi_refs
+from .FakeAnsibleModule import FailJsonException
+from .common import fake_xenapi_ref, testcase_bad_xenapi_refs
 
 
 testcase_set_vm_power_state_bad_transitions = {
diff --git a/tests/unit/module_utils/xenserver/test_wait_for_functions.py b/tests/unit/module_utils/xenserver/test_wait_for_functions.py
index 1dfab97ff6..9358e0bd91 100644
--- a/tests/unit/module_utils/xenserver/test_wait_for_functions.py
+++ b/tests/unit/module_utils/xenserver/test_wait_for_functions.py
@@ -9,8 +9,8 @@ __metaclass__ = type
 
 import pytest
 
-from ..FakeAnsibleModule import FailJsonException
-from ..common import fake_xenapi_ref, testcase_bad_xenapi_refs
+from .FakeAnsibleModule import FailJsonException
+from .common import fake_xenapi_ref, testcase_bad_xenapi_refs
 
 
 testcase_wait_for_vm_ip_address_bad_power_states = {
diff --git a/tests/unit/module_utils/xenserver/test_xapi.py b/tests/unit/module_utils/xenserver/test_xapi.py
index 01a637df72..63cbbea1ba 100644
--- a/tests/unit/module_utils/xenserver/test_xapi.py
+++ b/tests/unit/module_utils/xenserver/test_xapi.py
@@ -10,7 +10,7 @@ __metaclass__ = type
 import pytest
 import atexit
 
-from ..FakeAnsibleModule import FailJsonException
+from .FakeAnsibleModule import FailJsonException
 from ansible.module_utils.ansible_release import __version__ as ANSIBLE_VERSION
 
 
diff --git a/tests/unit/module_utils/xenserver/test_xenserverobject.py b/tests/unit/module_utils/xenserver/test_xenserverobject.py
index 7b2d756fa7..8df2e2cadf 100644
--- a/tests/unit/module_utils/xenserver/test_xenserverobject.py
+++ b/tests/unit/module_utils/xenserver/test_xenserverobject.py
@@ -9,8 +9,8 @@ __metaclass__ = type
 
 import pytest
 
-from ..FakeAnsibleModule import FailJsonException
-from ..common import fake_xenapi_ref
+from .FakeAnsibleModule import FailJsonException
+from .common import fake_xenapi_ref
 
 
 def test_xenserverobject_xenapi_lib_detection(mocker, fake_ansible_module, xenserver):
diff --git a/tests/unit/modules/cloud/xenserver/conftest.py b/tests/unit/modules/cloud/xenserver/conftest.py
index a5285ac938..9b2d7051ea 100644
--- a/tests/unit/modules/cloud/xenserver/conftest.py
+++ b/tests/unit/modules/cloud/xenserver/conftest.py
@@ -11,7 +11,7 @@ import sys
 import importlib
 import pytest
 
-from ..FakeAnsibleModule import FakeAnsibleModule
+from .FakeAnsibleModule import FakeAnsibleModule
 
 
 @pytest.fixture