diff --git a/teuthology/suite/__init__.py b/teuthology/suite/__init__.py
index 8d4c316d3..3fafd2b4b 100644
--- a/teuthology/suite/__init__.py
+++ b/teuthology/suite/__init__.py
@@ -144,10 +144,11 @@ def main(args):
 
     run = Run(conf)
     name = run.name
-    run.prepare_and_schedule()
+    job_count = run.prepare_and_schedule()
     if not conf.dry_run and conf.wait:
         return wait(name, config.max_job_time,
                     conf.archive_upload_url)
+    return job_count
 
 
 def get_rerun_conf_overrides(conf):
diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index cb7b32cd4..147d2eaf2 100644
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -482,6 +482,8 @@ def prepare_and_schedule(self):
         if num_jobs:
             self.write_result()
 
+        return num_jobs
+
     def collect_jobs(self, arch, configs, newest=False, limit=0):
         jobs_to_schedule = []
         jobs_missing_packages = []