diff --git a/log_processor/client.py b/log_processor/client.py
index 540fe29..d955c2f 100644
--- a/log_processor/client.py
+++ b/log_processor/client.py
@@ -36,14 +36,6 @@ except ImportError:
     import daemon.pidfile as pidfile_mod
 
 
-class SubunitProcessor(EventProcessor):
-    def __init__(self, zmq_address, gearman_client, files, source_url):
-        super(SubunitProcessor, self).__init__(zmq_address, gearman_client,
-                    files, source_url)
-
-    def _make_gear_job(self, output):
-        return gear.Job(b'push-subunit', json.dumps(output).encode('utf8'))
-
 class EventProcessor(threading.Thread):
     def __init__(self, zmq_address, gearman_client, files, source_url):
         threading.Thread.__init__(self)
@@ -94,15 +86,16 @@ class EventProcessor(threading.Thread):
             output['source_url'] = source_url
             output['retry'] = fileopts.get('retry-get', False)
             output['event'] = out_event
-            job = _make_gear_job(output)
+            if 'subunit' in fileopts.get('name'):
+                job = gear.Job(b'push-subunit',
+                               json.dumps(output).encode('utf8'))
+            else:
+                job = gear.Job(b'push-log', json.dumps(output).encode('utf8'))
             try:
                 self.gearman_client.submitJob(job)
             except:
                 logging.exception("Exception submitting job to Gearman.")
 
-    def _make_gear_job(self, output):
-        return gear.Job(b'push-log', json.dumps(output).encode('utf8'))
-
     def _get_log_dir(self, event):
         parameters = event["build"].get("parameters", {})
         base = parameters.get('LOG_PATH', 'UNKNOWN')
@@ -174,7 +167,7 @@ class Server(object):
             log_processor = EventProcessor(
                 publisher, gearclient,
                 self.config['source-files'], self.source_url)
-            subunit_processor = SubunitProcessor(
+            subunit_processor = EventProcessor(
                 publisher, gearclient,
                 self.config['subunit-files'], self.source_url)
             self.processors.append(log_processor)