diff --git a/avocado/linux/__init__.py b/avocado/linux/__init__.py
deleted file mode 100644
index e090f039bdfc0f30c1aa28dcc97bef058197d377..0000000000000000000000000000000000000000
--- a/avocado/linux/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# See LICENSE for more details.
-#
-# Copyright: Red Hat Inc. 2013-2014
-# Author: Lucas Meneghel Rodrigues <lmr@redhat.com>
diff --git a/avocado/linux/kernel_build.py b/avocado/utils/kernel_build.py
similarity index 100%
rename from avocado/linux/kernel_build.py
rename to avocado/utils/kernel_build.py
diff --git a/examples/tests/linuxbuild.py b/examples/tests/linuxbuild.py
index 27c2b494f49a74b9d067e61506d350264a4ff1a9..36c6e9f5042ab44a7eee5f71f9dfcaecaa917bf0 100755
--- a/examples/tests/linuxbuild.py
+++ b/examples/tests/linuxbuild.py
@@ -2,7 +2,7 @@
 
 from avocado import Test
 from avocado import main
-from avocado.linux import kernel_build
+from avocado.utils import kernel_build
 
 
 class LinuxBuildTest(Test):
diff --git a/setup.py b/setup.py
index 4ebe3b480fc84f403c8bebd94a41b82ef3f3025f..5c085fe990d0db3686f6079731dcfbd342a28139 100755
--- a/setup.py
+++ b/setup.py
@@ -109,7 +109,6 @@ if __name__ == '__main__':
           packages=['avocado',
                     'avocado.core',
                     'avocado.core.plugins',
-                    'avocado.linux',
                     'avocado.utils',
                     'avocado.core.remote',
                     'avocado.restclient',