--- a/testing/talos/talos/output.py
+++ b/testing/talos/talos/output.py
@@ -55,22 +55,20 @@ class Output(object):
 
         for test in self.results.results:
             # serialize test results
             tsresult = None
             if not test.using_xperf:
                 subtests = []
                 suite = {
                     'name': test.name(),
-                    'subtests': subtests,
+                    'extraOptions': self.results.extra_options or [],
+                    'subtests': subtests
                 }
 
-                if self.results.extra_options:
-                    suite['extraOptions'] = self.results.extra_options
-
                 suites.append(suite)
                 vals = []
                 replicates = {}
 
                 # TODO: counters!!!! we don't have any, but they suffer the
                 # same
                 for result in test.results:
                     # XXX this will not work for manifests which list
@@ -161,16 +159,17 @@ class Output(object):
                             subtest['value'] = vals[0]
                     else:
                         # calculate mean value
                         if len(vals) > 0:
                             varray = [float(v) for v in vals]
                             subtest['value'] = filter.mean(varray)
             if counter_subtests:
                 suites.append({'name': test.name(),
+                               'extraOptions': self.results.extra_options or [],
                                'subtests': counter_subtests})
         return test_results
 
     def output(self, results, results_url, tbpl_output):
         """output to the a file if results_url starts with file://
         - results : json instance
         - results_url : file:// URL
         """