diff --git a/site_utils/test_runner_utils.py b/site_utils/test_runner_utils.py
index 000a2c1..0a8028a 100755
--- a/site_utils/test_runner_utils.py
+++ b/site_utils/test_runner_utils.py
@@ -518,7 +518,7 @@
             ctrl_files = get_all_control_files(test, autotest_path)
             for control in ctrl_files:
                 test_num += 1
-                job = SimpleJob(name="adhoc/{}".format(test),
+                job = SimpleJob(name="adhoc/{}".format(control.name),
                                 owner='autotest_system',
                                 test_num=test_num)
                 job.set_control_file(control)
diff --git a/site_utils/test_runner_utils_unittest.py b/site_utils/test_runner_utils_unittest.py
index daafa6c..12cfd30 100755
--- a/site_utils/test_runner_utils_unittest.py
+++ b/site_utils/test_runner_utils_unittest.py
@@ -64,6 +64,7 @@
         self.text = text
         self.test_type = 'client'
         self.dependencies = deps
+        self.name = None
 
 
 class TestRunnerUnittests(mox.MoxTestBase):