diff --git a/common/sai_dataplane/ptf/sai_ptf_dataplane.py b/common/sai_dataplane/ptf/sai_ptf_dataplane.py
index 49d8390f..78e46f35 100644
--- a/common/sai_dataplane/ptf/sai_ptf_dataplane.py
+++ b/common/sai_dataplane/ptf/sai_ptf_dataplane.py
@@ -149,7 +149,10 @@ def __logging_setup(config):
     @staticmethod
     def __import_module(root_path, module_name):
         module_specs = importlib.util.find_spec(module_name, [root_path])
-        return module_specs.loader.load_module()
+        module = importlib.util.module_from_spec(module_specs)
+        sys.modules[module_name] = module
+        module_specs.loader.exec_module(module)
+        return module
 
     def init(self):
         global ptf
diff --git a/common/sai_testbed.py b/common/sai_testbed.py
index 04190500..b9030cfd 100644
--- a/common/sai_testbed.py
+++ b/common/sai_testbed.py
@@ -3,6 +3,7 @@
 import json
 import glob
 import logging
+import sys
 
 from saichallenger.common.sai_dut import SaiDut
 from saichallenger.common.sai_npu import SaiNpu
@@ -111,7 +112,10 @@ def __init__(self, base_dir, name, with_traffic, skip_dataplane=False):
     @staticmethod
     def import_module(root_path, module_name):
         module_specs = importlib.util.spec_from_file_location(module_name, os.path.join(root_path, f"{module_name}.py"))
-        return module_specs.loader.load_module()
+        module = importlib.util.module_from_spec(module_specs)
+        sys.modules[module_name] = module
+        module_specs.loader.exec_module(module)
+        return module
 
     @staticmethod
     def spawn_asic(base_dir, cfg, asic_type="npu"):