diff --git a/tests/__init__.py b/tests/__init__.py
index dc169e8b..ecc16a69 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -20,6 +20,7 @@
 #
 # Written by Matt Prahl <mprahl@redhat.com
 
+import os
 import module_build_service
 
 from datetime import datetime, timedelta
@@ -177,3 +178,61 @@ def init_data():
         db.session.add(build_two)
         db.session.add(build_three)
         db.session.commit()
+
+
+def scheduler_init_data():
+    db.session.remove()
+    db.drop_all()
+    db.create_all()
+    insert_fake_baseruntime()
+
+    current_dir = os.path.dirname(__file__)
+    star_command_yml_path = os.path.join(
+        current_dir, 'test_scheduler', 'starcommand.yaml')
+    with open(star_command_yml_path, 'r') as f:
+        yaml = f.read()
+
+    build_one = module_build_service.models.ModuleBuild()
+    build_one.name = 'starcommand'
+    build_one.stream = '1'
+    build_one.version = 3
+    build_one.state = 2
+    build_one.modulemd = yaml
+    build_one.koji_tag = 'module-starcommand-1.3'
+    build_one.scmurl = ('git://pkgs.domain.local/modules/star-command?'
+                        '#da95886b7a443b36a9ce31abda1f9bef22f2f8c6')
+    build_one.batch = 2
+    # https://www.youtube.com/watch?v=iOKymYVSaJE
+    build_one.owner = 'Buzz Lightyear'
+    build_one.time_submitted = datetime(2016, 12, 9, 11, 23, 20)
+    build_one.time_modified = datetime(2016, 12, 9, 11, 25, 32)
+
+    component_one_build_one = module_build_service.models.ComponentBuild()
+    component_one_build_one.package = 'communicator'
+    component_one_build_one.scmurl = \
+        ('git://pkgs.domain.local/rpms/communicator?'
+         '#da95886c8a443b36a9ce31abda1f9bed22f2f9c2')
+    component_one_build_one.format = 'rpms'
+    component_one_build_one.task_id = 12312345
+    component_one_build_one.state = None
+    component_one_build_one.nvr = 'communicator-1.10.1-2.module_starcommand_1_3'
+    component_one_build_one.batch = 2
+    component_one_build_one.module_id = 2
+
+    component_two_build_one = module_build_service.models.ComponentBuild()
+    component_two_build_one.package = 'module-build-macros'
+    component_two_build_one.scmurl = \
+        ('/tmp/module_build_service-build-macrosWZUPeK/SRPMS/'
+         'module-build-macros-0.1-1.module_starcommand_1_3.src.rpm')
+    component_two_build_one.format = 'rpms'
+    component_two_build_one.task_id = 12312321
+    component_two_build_one.state = 1
+    component_two_build_one.nvr = \
+        'module-build-macros-01-1.module_starcommand_1_3'
+    component_two_build_one.batch = 2
+    component_two_build_one.module_id = 2
+
+    db.session.add(build_one)
+    db.session.add(component_one_build_one)
+    db.session.add(component_two_build_one)
+    db.session.commit()
diff --git a/tests/test_scheduler/starcommand.yaml b/tests/test_scheduler/starcommand.yaml
new file mode 100644
index 00000000..58e8efe5
--- /dev/null
+++ b/tests/test_scheduler/starcommand.yaml
@@ -0,0 +1,32 @@
+document: modulemd
+version: 1
+data:
+    summary: Buzz Lightyear's Star Command Communicator
+    description: Buzz Lightyear's Star Command Communicator
+    name: starcommand
+    stream: teststream
+    version: 1
+    license:
+        module: [ MIT ]
+    dependencies:
+        buildrequires:
+            base-runtime: master
+        requires:
+            base-runtime: master
+    references:
+        community: https://fedoraproject.org/wiki/Modularity
+        documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules
+        tracker: https://taiga.fedorainfracloud.org/project/modularity
+    profiles:
+        default:
+            rpms:
+                - communicator
+    api:
+        rpms:
+            - communicator
+    components:
+        rpms:
+            communicator:
+                rationale: Provides the API for this module.
+                buildorder: 10
+                ref: f25
diff --git a/tests/test_scheduler/test_repo_done.py b/tests/test_scheduler/test_repo_done.py
index 2b3334ca..096ef6cf 100644
--- a/tests/test_scheduler/test_repo_done.py
+++ b/tests/test_scheduler/test_repo_done.py
@@ -26,18 +26,14 @@ import mock
 import module_build_service.messaging
 import module_build_service.scheduler.handlers.repos
 import module_build_service.models
+from tests import scheduler_init_data
+from tests import conf, db
 
 
 class TestRepoDone(unittest.TestCase):
 
     def setUp(self):
-        self.config = mock.Mock()
-        self.config.rpms_default_repository = 'dist_git_url'
-        self.config.koji_profile = 'staging'  # TODO - point at a fake test config
-
-
-        self.session = mock.Mock()
-        self.fn = module_build_service.scheduler.handlers.repos.done
+        scheduler_init_data()
 
     @mock.patch('module_build_service.models.ModuleBuild.from_repo_done_event')
     def test_no_match(self, from_repo_done_event):
@@ -46,79 +42,47 @@ class TestRepoDone(unittest.TestCase):
         """
         from_repo_done_event.return_value = None
         msg = module_build_service.messaging.KojiRepoChange(
-            'no matches for this...', '2016-some-guid-build')
-        self.fn(config=self.config, session=self.session, msg=msg)
+            'no matches for this...', '2016-some-nonexistent-build')
+        module_build_service.scheduler.handlers.repos.done(
+            config=conf, session=db.session, msg=msg)
 
-    @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_ready')
+    @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_ready', return_value=True)
     @mock.patch('module_build_service.builder.KojiModuleBuilder.get_session')
     @mock.patch('module_build_service.builder.KojiModuleBuilder.build')
     @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_connect')
-    @mock.patch('module_build_service.models.ModuleBuild.from_repo_done_event')
-    @mock.patch('module_build_service.utils.at_concurrent_component_threshold',
-                return_value=False)
-    def test_a_single_match(self, threshold, from_repo_done_event, connect, build_fn, config, ready):
+    def test_a_single_match(self, connect, build_fn, get_session, ready):
         """ Test that when a repo msg hits us and we have a single match.
         """
-        config.return_value = mock.Mock(), "development"
-        unbuilt_component_build = mock.Mock()
-        unbuilt_component_build.package = 'foo'
-        unbuilt_component_build.scmurl = 'full_scm_url'
-        unbuilt_component_build.state = None
-        unbuilt_component_build.batch = 2
-        built_component_build = mock.Mock()
-        built_component_build.package = 'foo2'
-        built_component_build.scmurl = 'full_scm_url'
-        built_component_build.state = 1
-        built_component_build.batch = 2
-        module_build = mock.Mock()
-        module_build.batch = 1
-        module_build.component_builds = [unbuilt_component_build, built_component_build]
-        module_build.current_batch.return_value = [built_component_build]
-        build_fn.return_value = 1234, 1, "", None
-
-        from_repo_done_event.return_value = module_build
-
-        ready.return_value = True
+        get_session.return_value = mock.Mock(), 'development'
+        build_fn.return_value = 1234, 1, '', None
 
         msg = module_build_service.messaging.KojiRepoChange(
-            'no matches for this...', '2016-some-guid-build')
-        self.fn(config=self.config, session=self.session, msg=msg)
-        build_fn.assert_called_once_with(artifact_name='foo', source='full_scm_url')
+            'some_msg_id', 'module-starcommand-1.3-build')
+        module_build_service.scheduler.handlers.repos.done(
+            config=conf, session=db.session, msg=msg)
+        build_fn.assert_called_once_with(
+            artifact_name='communicator',
+            source='git://pkgs.domain.local/rpms/communicator?#da95886c8a443b36a9ce31abda1f9bed22f2f9c2')
 
-    @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_ready')
+    @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_ready', return_value=True)
     @mock.patch('module_build_service.builder.KojiModuleBuilder.get_session')
     @mock.patch('module_build_service.builder.KojiModuleBuilder.build')
     @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_connect')
-    @mock.patch('module_build_service.models.ModuleBuild.from_repo_done_event')
-    @mock.patch('module_build_service.utils.at_concurrent_component_threshold',
-                return_value=False)
-    def test_a_single_match_build_fail(self, threshold, from_repo_done_event, connect, build_fn, config, ready):
+    def test_a_single_match_build_fail(self, connect, build_fn, config, ready):
         """ Test that when a KojiModuleBuilder.build fails, the build is
         marked as failed with proper state_reason.
         """
-        config.return_value = mock.Mock(), "development"
-        unbuilt_component_build = mock.Mock()
-        unbuilt_component_build.package = 'foo'
-        unbuilt_component_build.scmurl = 'full_scm_url'
-        unbuilt_component_build.state = None
-        unbuilt_component_build.batch = 2
-        built_component_build = mock.Mock()
-        built_component_build.package = 'foo2'
-        built_component_build.scmurl = 'full_scm_url'
-        built_component_build.state = 1
-        built_component_build.batch = 2
-        module_build = mock.Mock()
-        module_build.batch = 1
-        module_build.component_builds = [unbuilt_component_build, built_component_build]
-        module_build.current_batch.return_value = [built_component_build]
-        build_fn.return_value = None, 4, "Failed to submit artifact foo to Koji", None
-
-        from_repo_done_event.return_value = module_build
-
-        ready.return_value = True
+        config.return_value = mock.Mock(), 'development'
+        build_fn.return_value = None, 4, 'Failed to submit artifact communicator to Koji', None
 
         msg = module_build_service.messaging.KojiRepoChange(
-            'no matches for this...', '2016-some-guid-build')
-        self.fn(config=self.config, session=self.session, msg=msg)
-        build_fn.assert_called_once_with(artifact_name='foo', source='full_scm_url')
-        self.assertEquals(unbuilt_component_build.state_reason, "Failed to submit artifact foo to Koji")
+            'some_msg_id', 'module-starcommand-1.3-build')
+        module_build_service.scheduler.handlers.repos.done(
+            config=conf, session=db.session, msg=msg)
+        build_fn.assert_called_once_with(
+            artifact_name='communicator',
+            source='git://pkgs.domain.local/rpms/communicator?#da95886c8a443b36a9ce31abda1f9bed22f2f9c2')
+        component_build = module_build_service.models.ComponentBuild.query\
+            .filter_by(package='communicator').one()
+        self.assertEquals(component_build.state_reason,
+                          'Failed to submit artifact communicator to Koji')