diff --git a/module_build_service/__init__.py b/module_build_service/__init__.py
index cd1c0914..4424d1a7 100644
--- a/module_build_service/__init__.py
+++ b/module_build_service/__init__.py
@@ -29,7 +29,7 @@ import gi  # noqa
 gi.require_version("Modulemd", "2.0")  # noqa
 from gi.repository import Modulemd  # noqa
 
-from module_build_service.logger import init_logging, ModuleBuildLogs, level_flags, MBSLogger
+from module_build_service.common.logger import init_logging, ModuleBuildLogs, level_flags, MBSLogger
 
 from module_build_service.common.errors import (
     ValidationError, Unauthorized, UnprocessableEntity, Conflict, NotFound,
diff --git a/module_build_service/common/config.py b/module_build_service/common/config.py
index 2590e955..b84d52ad 100644
--- a/module_build_service/common/config.py
+++ b/module_build_service/common/config.py
@@ -10,7 +10,7 @@ import tempfile
 
 from six import string_types
 
-from module_build_service import logger
+from module_build_service.common import logger
 # This avoids creating a circular import by importing log from module_build_service
 log = logging.getLogger('module_build_service')
 
diff --git a/module_build_service/logger.py b/module_build_service/common/logger.py
similarity index 100%
rename from module_build_service/logger.py
rename to module_build_service/common/logger.py
diff --git a/tests/test_logger.py b/tests/test_common/test_logger.py
similarity index 98%
rename from tests/test_logger.py
rename to tests/test_common/test_logger.py
index 1a584b39..c17577b9 100644
--- a/tests/test_logger.py
+++ b/tests/test_common/test_logger.py
@@ -8,7 +8,7 @@ import tempfile
 from module_build_service import log
 from module_build_service.common import models
 from module_build_service.scheduler.db_session import db_session
-from module_build_service.logger import ModuleBuildLogs
+from module_build_service.common.logger import ModuleBuildLogs
 from module_build_service.scheduler.consumer import MBSConsumer
 from tests import init_data