diff --git a/generic/__init__.py b/generic/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/qemu/tests/live_snapshot.py b/qemu/tests/live_snapshot.py
index 6af64846c04f31c4e4387bc41b69297589a30a9b..eb43134c3790003e15620e6a6e653b61438d2988 100644
--- a/qemu/tests/live_snapshot.py
+++ b/qemu/tests/live_snapshot.py
@@ -2,7 +2,7 @@ import time
 import logging
 from autotest.client.shared import error
 from virttest import utils_test
-from tests import file_transfer
+from generic.tests import file_transfer
 
 
 def run(test, params, env):
diff --git a/qemu/tests/migration.py b/qemu/tests/migration.py
index a13d3835ee28a970ae3ff4f1b90f880db75fce4a..3e825cc2833f79eb1d4941d4f3e12a65637d5a6d 100644
--- a/qemu/tests/migration.py
+++ b/qemu/tests/migration.py
@@ -27,7 +27,7 @@ def run(test, params, env):
 
         :param type: type of stress test.
         """
-        from tests import autotest_control
+        from generic.tests import autotest_control
 
         timeout = 0
 
diff --git a/qemu/tests/numa_stress.py b/qemu/tests/numa_stress.py
index dc788664609d32a1999ec4807c646b1a4040b8e6..f9190ab088a860c2e4a11a29151e2ac41b373e52 100644
--- a/qemu/tests/numa_stress.py
+++ b/qemu/tests/numa_stress.py
@@ -3,7 +3,7 @@ import os
 from autotest.client.shared import error
 from autotest.client import utils
 from virttest import utils_misc, funcatexit, utils_test, data_dir
-from tests import autotest_control
+from generic.tests import autotest_control
 
 try:
     from virttest.staging import utils_memory
diff --git a/qemu/tests/qemu_guest_agent_suspend.py b/qemu/tests/qemu_guest_agent_suspend.py
index 0458f9d2baac5619be2b79fcd0a182e15f686c74..6ba4d0a7e9871b7063be84436339825b2929a475 100644
--- a/qemu/tests/qemu_guest_agent_suspend.py
+++ b/qemu/tests/qemu_guest_agent_suspend.py
@@ -1,7 +1,7 @@
 import logging
 from autotest.client.shared import error
 from virttest import guest_agent
-from tests.guest_suspend import GuestSuspendBaseTest
+from generic.tests.guest_suspend import GuestSuspendBaseTest
 from qemu.tests.qemu_guest_agent import QemuGuestAgentTest
 
 
diff --git a/qemu/tests/suspend_under_stress.py b/qemu/tests/suspend_under_stress.py
index b7737fd3682dc9e8f1451cd526c5ec634433a14e..bd957efc7a7dbfd2ac1f75fcc3a26097ee361627 100644
--- a/qemu/tests/suspend_under_stress.py
+++ b/qemu/tests/suspend_under_stress.py
@@ -2,7 +2,7 @@ import logging
 from autotest.client import utils
 from autotest.client.shared import error
 from virttest import utils_test, utils_misc
-from tests import guest_suspend
+from generic.tests import guest_suspend
 
 
 @error.context_aware
diff --git a/qemu/tests/timedrift_adjust_time.py b/qemu/tests/timedrift_adjust_time.py
index 39266ddbe03251c86e76c7b5d2fabf9827b7b4f1..0b0f26de1711d0d197caac7ff16f91ee9608224f 100644
--- a/qemu/tests/timedrift_adjust_time.py
+++ b/qemu/tests/timedrift_adjust_time.py
@@ -6,7 +6,7 @@ from autotest.client.shared import error
 from autotest.client.shared import utils
 from virttest import data_dir
 from virttest import env_process
-from tests.guest_suspend import GuestSuspendBaseTest
+from generic.tests.guest_suspend import GuestSuspendBaseTest
 
 
 class TimedriftTest(object):
diff --git a/qemu/tests/timedrift_no_net.py b/qemu/tests/timedrift_no_net.py
index 4435facc40436e5c00595e60a4c69bbc1143e094..0dd05aa79fcde365f359f34e18165326a5d8d7de 100644
--- a/qemu/tests/timedrift_no_net.py
+++ b/qemu/tests/timedrift_no_net.py
@@ -4,7 +4,7 @@ from autotest.client.shared import error
 from autotest.client import utils
 from virttest import utils_test
 from virttest import utils_misc
-from tests.guest_suspend import GuestSuspendBaseTest
+from generic.tests.guest_suspend import GuestSuspendBaseTest
 
 
 class GuestSuspendSerialConsole(GuestSuspendBaseTest):
diff --git a/qemu/tests/timedrift_no_net_win.py b/qemu/tests/timedrift_no_net_win.py
index 03c60c4e7c245e7ae477c93eecd8c2e8e697b284..3264a4455de935bec4c811cd1c3817afdf522323 100644
--- a/qemu/tests/timedrift_no_net_win.py
+++ b/qemu/tests/timedrift_no_net_win.py
@@ -4,7 +4,7 @@ from autotest.client.shared import error
 from autotest.client import utils
 from virttest import utils_test
 from virttest import utils_misc
-from tests.guest_suspend import GuestSuspendBaseTest
+from generic.tests.guest_suspend import GuestSuspendBaseTest
 
 
 class GuestSuspendSerialConsole(GuestSuspendBaseTest):
diff --git a/qemu/tests/yonit_bitmap.py b/qemu/tests/yonit_bitmap.py
index 7f01c41852f4627a7a535658531bb6d706e7eb08..3b7d21b29fa740bcc2d55738a09a4e48253168aa 100644
--- a/qemu/tests/yonit_bitmap.py
+++ b/qemu/tests/yonit_bitmap.py
@@ -2,7 +2,7 @@ import logging
 import signal
 from autotest.client.shared import error
 from virttest import utils_misc
-from tests import guest_test
+from generic.tests import guest_test
 
 
 @error.context_aware