diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 16a353b..9f99275 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -2098,6 +2098,12 @@
   "Fuchsia Release": {
     "isolated_scripts": [
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "audio_decoder_unittests",
         "merge": {
           "args": [],
@@ -2105,8 +2111,8 @@
         },
         "name": "audio_decoder_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2120,6 +2126,12 @@
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "common_audio_unittests",
         "merge": {
           "args": [],
@@ -2127,8 +2139,8 @@
         },
         "name": "common_audio_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2142,6 +2154,12 @@
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "common_video_unittests",
         "merge": {
           "args": [],
@@ -2149,8 +2167,8 @@
         },
         "name": "common_video_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2164,6 +2182,12 @@
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "dcsctp_unittests",
         "merge": {
           "args": [],
@@ -2171,8 +2195,8 @@
         },
         "name": "dcsctp_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2187,7 +2211,11 @@
       },
       {
         "args": [
-          "--quick"
+          "--quick",
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
         ],
         "isolate_name": "low_bandwidth_audio_test",
         "merge": {
@@ -2196,8 +2224,8 @@
         },
         "name": "low_bandwidth_audio_test",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2211,6 +2239,12 @@
         "test_id_prefix": "ninja://audio:low_bandwidth_audio_test/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "rtc_media_unittests",
         "merge": {
           "args": [],
@@ -2218,8 +2252,8 @@
         },
         "name": "rtc_media_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2233,6 +2267,12 @@
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "rtc_pc_unittests",
         "merge": {
           "args": [],
@@ -2240,8 +2280,8 @@
         },
         "name": "rtc_pc_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2255,6 +2295,12 @@
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "svc_tests",
         "merge": {
           "args": [],
@@ -2262,8 +2308,8 @@
         },
         "name": "svc_tests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2278,6 +2324,12 @@
         "test_id_prefix": "ninja://pc:svc_tests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "system_wrappers_unittests",
         "merge": {
           "args": [],
@@ -2285,8 +2337,8 @@
         },
         "name": "system_wrappers_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2300,6 +2352,12 @@
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "video_engine_tests",
         "merge": {
           "args": [],
@@ -2307,8 +2365,8 @@
         },
         "name": "video_engine_tests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2323,6 +2381,12 @@
         "test_id_prefix": "ninja://:video_engine_tests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "voip_unittests",
         "merge": {
           "args": [],
@@ -2330,8 +2394,8 @@
         },
         "name": "voip_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json
index 680556a..9644628 100644
--- a/infra/specs/client.webrtc.perf.json
+++ b/infra/specs/client.webrtc.perf.json
@@ -325,11 +325,12 @@
     "isolated_scripts": [
       {
         "args": [
-          "--nologs",
-          "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.json",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json",
           "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
           "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
-          "--test-arg=--undefok=test_launcher_summary_output"
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--nologs",
+          "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.json"
         ],
         "isolate_name": "fuchsia_perf_tests",
         "merge": {
@@ -341,8 +342,8 @@
         },
         "name": "fuchsia_perf_tests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -357,8 +358,7 @@
           "expiration": 10800,
           "hard_timeout": 10800,
           "idempotent": false,
-          "io_timeout": 10800,
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+          "io_timeout": 10800
         },
         "test_id_prefix": "ninja://:fuchsia_perf_tests/"
       }
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 47004f2..8bc6f0c 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -211,8 +211,8 @@
     'swarming': {
       'dimensions': {
         'os': 'Windows-10-19042|Windows-10-19045'
-      }
-    }
+      },
+    },
   },
   'xcode_13_main': {
     '$mixin_append': {
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index f4c11d4..2e63046 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -118,7 +118,9 @@
     },
     'fuchsia_compatible_perf_tests': {
       'fuchsia_perf_tests': {
-        'mixins': ['perf-fuchsia-perf-tests', 'fuchsia-gtest-output'],
+        'mixins': [
+          'perf-fuchsia-perf-tests',
+        ],
       },
     },
     'fuchsia_compatible_tests': {
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 4e1a0d5..26b8e14 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -2208,6 +2208,12 @@
   "fuchsia_rel": {
     "isolated_scripts": [
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "audio_decoder_unittests",
         "merge": {
           "args": [],
@@ -2215,8 +2221,8 @@
         },
         "name": "audio_decoder_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2230,6 +2236,12 @@
         "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "common_audio_unittests",
         "merge": {
           "args": [],
@@ -2237,8 +2249,8 @@
         },
         "name": "common_audio_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2252,6 +2264,12 @@
         "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "common_video_unittests",
         "merge": {
           "args": [],
@@ -2259,8 +2277,8 @@
         },
         "name": "common_video_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2274,6 +2292,12 @@
         "test_id_prefix": "ninja://common_video:common_video_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "dcsctp_unittests",
         "merge": {
           "args": [],
@@ -2281,8 +2305,8 @@
         },
         "name": "dcsctp_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2297,7 +2321,11 @@
       },
       {
         "args": [
-          "--quick"
+          "--quick",
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
         ],
         "isolate_name": "low_bandwidth_audio_test",
         "merge": {
@@ -2306,8 +2334,8 @@
         },
         "name": "low_bandwidth_audio_test",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2321,6 +2349,12 @@
         "test_id_prefix": "ninja://audio:low_bandwidth_audio_test/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "rtc_media_unittests",
         "merge": {
           "args": [],
@@ -2328,8 +2362,8 @@
         },
         "name": "rtc_media_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2343,6 +2377,12 @@
         "test_id_prefix": "ninja://media:rtc_media_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "rtc_pc_unittests",
         "merge": {
           "args": [],
@@ -2350,8 +2390,8 @@
         },
         "name": "rtc_pc_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2365,6 +2405,12 @@
         "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "svc_tests",
         "merge": {
           "args": [],
@@ -2372,8 +2418,8 @@
         },
         "name": "svc_tests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2388,6 +2434,12 @@
         "test_id_prefix": "ninja://pc:svc_tests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "system_wrappers_unittests",
         "merge": {
           "args": [],
@@ -2395,8 +2447,8 @@
         },
         "name": "system_wrappers_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2410,6 +2462,12 @@
         "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "video_engine_tests",
         "merge": {
           "args": [],
@@ -2417,8 +2475,8 @@
         },
         "name": "video_engine_tests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2433,6 +2491,12 @@
         "test_id_prefix": "ninja://:video_engine_tests/"
       },
       {
+        "args": [
+          "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
+          "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
+          "--test-arg=--undefok=test_launcher_summary_output",
+          "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+        ],
         "isolate_name": "voip_unittests",
         "merge": {
           "args": [],
@@ -2440,8 +2504,8 @@
         },
         "name": "voip_unittests",
         "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
+          "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+          "result_format": "gtest_json"
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index aac6d08..a24ada6 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -67,8 +67,12 @@
       'Android64 Builder x64 (dbg)': {},
       'Fuchsia Builder': {},
       'Fuchsia Release': {
-        'os_type': 'linux',
-        'mixins': ['linux-bionic', 'x86-64', 'has_native_resultdb_integration'],
+        'os_type':
+        'linux',
+        'mixins': [
+          'linux-bionic', 'x86-64', 'fuchsia-gtest-output',
+          'resultdb-gtest-json-format'
+        ],
         'test_suites': {
           'isolated_scripts': 'fuchsia_compatible_tests',
         },
@@ -284,7 +288,7 @@
         'linux',
         'mixins': [
           'linux-bionic', 'x86-64', 'perf-pool-vm', 'timeout-3h',
-          'has_native_resultdb_integration', 'chromium-tester-service-account'
+          'resultdb-gtest-json-format', 'fuchsia-gtest-output'
         ],
         'test_suites': {
           'isolated_scripts': 'fuchsia_compatible_perf_tests',
@@ -435,8 +439,12 @@
       'android_compile_x86_dbg': {},
       'android_compile_x86_rel': {},
       'fuchsia_rel': {
-        'os_type': 'linux',
-        'mixins': ['linux-bionic', 'x86-64', 'has_native_resultdb_integration'],
+        'os_type':
+        'linux',
+        'mixins': [
+          'linux-bionic', 'x86-64', 'fuchsia-gtest-output',
+          'resultdb-gtest-json-format'
+        ],
         'test_suites': {
           'isolated_scripts': 'fuchsia_compatible_tests',
         },