diff --git a/avocado/core/job.py b/avocado/core/job.py
index fc281ab8512ce8a71ad26f50a5ed64cdb9aba6f2..35b1a56dc691b1e16a1bb6ecbd17938556e78907 100644
--- a/avocado/core/job.py
+++ b/avocado/core/job.py
@@ -29,7 +29,9 @@ import fnmatch
 from avocado import multiplexer
 from avocado import result
 from avocado import runtime
-from avocado import sysinfo
+from avocado.core import runner
+from avocado.core import loader
+from avocado.core import sysinfo
 from avocado.core import runner
 from avocado.core import loader
 from avocado.core import data_dir
diff --git a/avocado/sysinfo.py b/avocado/core/sysinfo.py
similarity index 100%
rename from avocado/sysinfo.py
rename to avocado/core/sysinfo.py
diff --git a/avocado/plugins/sysinfo.py b/avocado/plugins/sysinfo.py
index 1e9c1e0271570de722bc8d7c64e782a42da7f2cb..ca8c7d82bb2211d400a206fb94af4a25dfd4d297 100644
--- a/avocado/plugins/sysinfo.py
+++ b/avocado/plugins/sysinfo.py
@@ -16,7 +16,7 @@ System information plugin
 """
 
 from avocado.plugins import plugin
-from avocado import sysinfo
+from avocado.core import sysinfo
 
 
 class SystemInformation(plugin.Plugin):
diff --git a/avocado/test.py b/avocado/test.py
index ccf9eeffc885263e1c78b8b94b2adbdbf250b43c..7e9779742914fa03b1f98c336ceb9c3b12c9cafd 100644
--- a/avocado/test.py
+++ b/avocado/test.py
@@ -31,7 +31,8 @@ if sys.version_info[:2] == (2, 6):
 else:
     import unittest
 
-from avocado import sysinfo, multiplexer
+from avocado import multiplexer
+from avocado.core import sysinfo
 from avocado.core import data_dir
 from avocado.core import exceptions
 from avocado.utils import genio
diff --git a/selftests/all/unit/avocado/sysinfo_unittest.py b/selftests/all/unit/avocado/sysinfo_unittest.py
index ab5e82b7d360f311d4aabc0a25fee72b9c72e198..0d09f2c9babeea58dabfd9e6152489eadd655aff 100644
--- a/selftests/all/unit/avocado/sysinfo_unittest.py
+++ b/selftests/all/unit/avocado/sysinfo_unittest.py
@@ -14,7 +14,7 @@ basedir = os.path.dirname(basedir)
 if os.path.isdir(os.path.join(basedir, 'avocado')):
     sys.path.append(basedir)
 
-from avocado import sysinfo
+from avocado.core import sysinfo
 
 
 class SysinfoTest(unittest.TestCase):