diff --git a/module_build_service/builder/base.py b/module_build_service/builder/base.py
index e240393d..f763dfec 100644
--- a/module_build_service/builder/base.py
+++ b/module_build_service/builder/base.py
@@ -131,12 +131,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)):
         Any additional arguments are optional extras which can be passed along
         and are implementation-dependent.
         """
-
-        if isinstance(config.system, Mock):
-            from koji import KojiModuleBuilder
-            return KojiModuleBuilder(owner=owner, module=module,
-                                     config=config, **extra)
-        elif backend in GenericBuilder.backends:
+        if backend in GenericBuilder.backends:
             return GenericBuilder.backends[backend](owner=owner, module=module,
                                                     config=config, **extra)
         else:
diff --git a/tests/test_scheduler/test_module_wait.py b/tests/test_scheduler/test_module_wait.py
index cd6563db..a5ed50a6 100644
--- a/tests/test_scheduler/test_module_wait.py
+++ b/tests/test_scheduler/test_module_wait.py
@@ -27,6 +27,7 @@ import module_build_service.scheduler.handlers.modules
 import modulemd as _modulemd
 import os
 import vcr
+from module_build_service import conf
 
 base_dir = os.path.dirname(os.path.dirname(__file__))
 cassette_dir = base_dir + '/vcr-request-data/'
@@ -35,7 +36,7 @@ cassette_dir = base_dir + '/vcr-request-data/'
 class TestModuleWait(unittest.TestCase):
 
     def setUp(self):
-        self.config = mock.Mock()
+        self.config = conf
         self.session = mock.Mock()
         self.fn = module_build_service.scheduler.handlers.modules.wait