diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 871bc4c7..d5ce5a26 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -46,13 +46,11 @@ import kobo.rpmlib
 
 import munch
 from OpenSSL.SSL import SysCallError
-from copr.client import CoprClient
 
 from module_build_service import log, db
 from module_build_service.models import ModuleBuild
 import module_build_service.utils
 
-
 logging.basicConfig(level=logging.DEBUG)
 
 # TODO: read defaults from module_build_service's config
@@ -811,6 +809,8 @@ class CoprModuleBuilder(GenericBuilder):
         m1 = db.session.query(ModuleBuild).first()
         m1.mmd().dump(modulemd)
 
+        from copr.client import CoprClient
+
         # @TODO how the authentication is designed?
         username, copr = "@copr", "modules"
         client = CoprClient.create_from_file_config()
diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py
index e48fde52..c637d5f3 100644
--- a/module_build_service/pdc.py
+++ b/module_build_service/pdc.py
@@ -27,12 +27,14 @@
 
 import modulemd
 from pdc_client import PDCClient
-from copr.client import CoprClient
+
+import logging
+log = logging.getLogger()
+
 import six
 import module_build_service
 
 
-
 def get_pdc_client_session(config):
     """
     :param config: instance of module_build_service.config.Config
@@ -161,7 +163,7 @@ def get_module_repo(session, module_info, strict=False, config=module_build_serv
     :param module_info: list of module_info dicts
     :param strict: Normally this function returns None if no module can be
            found.  If strict=True, then a ValueError is raised.
-    :param config: instance of rida.config.Config
+    :param config: instance of module_build_service.config.Config
     :return: URL to a DNF repository for the module
     """
     module = get_module(session, module_info, strict=strict)
@@ -173,6 +175,10 @@ def get_module_repo(session, module_info, strict=False, config=module_build_serv
     if module["koji_tag"] != "-":
         raise NotImplementedError
 
+    # TODO We should revisit the decision to include CoprClient code in the
+    # pdc.py module.
+    from copr.client import CoprClient
+
     # Module was built in Copr
     # @TODO get the correct user
     owner, nvr = "@copr", module["variant_id"]