diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 03d4de4c6f..7ac61a65d2 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -602,6 +602,41 @@
       }
     ]
   },
+  "Android32 (more configs)": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "1",
+              "device_os": "MMB29Q",
+              "device_type": "bullhead",
+              "os": "Android"
+            }
+          ],
+          "shards": 4
+        },
+        "test": "peerconnection_unittests",
+        "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+      }
+    ]
+  },
   "Android32 Builder arm": {
     "gtest_tests": [
       {
@@ -682,6 +717,32 @@
       }
     ]
   },
+  "Linux (more configs)": {
+    "isolated_scripts": [
+      {
+        "isolate_name": "peerconnection_unittests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "peerconnection_unittests",
+        "resultdb": {
+          "result_format": "json"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-18.04"
+            }
+          ],
+          "shards": 4
+        },
+        "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+      }
+    ]
+  },
   "Linux64 Builder": {
     "isolated_scripts": [
       {
@@ -1130,6 +1191,7 @@
       }
     ]
   },
+  "Linux64 Release (Libfuzzer)": {},
   "Mac64 Builder": {
     "isolated_scripts": [
       {
@@ -1590,6 +1652,32 @@
       }
     ]
   },
+  "Win (more configs)": {
+    "isolated_scripts": [
+      {
+        "isolate_name": "peerconnection_unittests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "peerconnection_unittests",
+        "resultdb": {
+          "result_format": "json"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Windows-7-SP1"
+            }
+          ],
+          "shards": 4
+        },
+        "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+      }
+    ]
+  },
   "Win32 Builder (Clang)": {
     "isolated_scripts": [
       {
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index a80ce9002f..2b4a0bbb98 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -222,6 +222,13 @@
         ],
       }
     },
+    'more_configs_tests': {
+      'peerconnection_unittests': {
+        'swarming': {
+          'shards': 4
+        },
+      },
+    },
     'win_video_capture_tests': {
       'video_capture_tests': {
         'remove_mixins': ['win7'],
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index d2a3fbe4b6..b6836d0fed 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -1906,6 +1906,41 @@
       }
     ]
   },
+  "android_arm_more_configs": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "1",
+              "device_os": "MMB29Q",
+              "device_type": "bullhead",
+              "os": "Android"
+            }
+          ],
+          "shards": 4
+        },
+        "test": "peerconnection_unittests",
+        "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+      }
+    ]
+  },
   "android_arm_rel": {
     "gtest_tests": [
       {
@@ -5931,6 +5966,7 @@
       }
     ]
   },
+  "linux_libfuzzer_rel": {},
   "linux_memcheck": {
     "isolated_scripts": [
       {
@@ -6340,6 +6376,32 @@
       }
     ]
   },
+  "linux_more_configs": {
+    "isolated_scripts": [
+      {
+        "isolate_name": "peerconnection_unittests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "peerconnection_unittests",
+        "resultdb": {
+          "result_format": "json"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-18.04"
+            }
+          ],
+          "shards": 4
+        },
+        "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+      }
+    ]
+  },
   "linux_msan": {
     "isolated_scripts": [
       {
@@ -13865,5 +13927,31 @@
         "test_id_prefix": "ninja://:webrtc_perf_tests/"
       }
     ]
+  },
+  "win_x86_more_configs": {
+    "isolated_scripts": [
+      {
+        "isolate_name": "peerconnection_unittests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "peerconnection_unittests",
+        "resultdb": {
+          "result_format": "json"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Windows-7-SP1"
+            }
+          ],
+          "shards": 4
+        },
+        "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+      }
+    ]
   }
 }
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 5478aba9fc..76be86563d 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -21,6 +21,15 @@
           'junit_tests': 'android_junit_tests',
         },
       },
+      'Android32 (more configs)': {
+        'mixins': [
+          'bullhead', 'marshmallow', 'android-devices', 'logdog-butler',
+          'has_native_resultdb_integration'
+        ],
+        'test_suites': {
+          'gtest_tests': 'more_configs_tests',
+        },
+      },
       'Android32 Builder arm': {
         'test_suites': {
           'gtest_tests': 'android_perf_tests',
@@ -31,6 +40,13 @@
           'gtest_tests': 'android_perf_tests',
         },
       },
+      'Linux (more configs)': {
+        'os_type': 'linux',
+        'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
+        'test_suites': {
+          'isolated_scripts': 'more_configs_tests',
+        },
+      },
       'Linux64 Builder': {
         'os_type': 'linux',
         'test_suites': {
@@ -44,6 +60,7 @@
           'isolated_scripts': 'linux_tests',
         },
       },
+      'Linux64 Release (Libfuzzer)': {},
       'Mac64 Builder': {
         'os_type': 'mac',
         'mixins': ['mac', 'x86-64'],
@@ -58,6 +75,13 @@
           'isolated_scripts': 'mac_tests',
         },
       },
+      'Win (more configs)': {
+        'os_type': 'win',
+        'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
+        'test_suites': {
+          'isolated_scripts': 'more_configs_tests',
+        },
+      },
       'Win32 Builder (Clang)': {
         'os_type': 'win',
         'test_suites': {
@@ -155,6 +179,15 @@
           'junit_tests': 'android_junit_tests',
         },
       },
+      'android_arm_more_configs': {
+        'mixins': [
+          'bullhead', 'marshmallow', 'android-devices', 'logdog-butler',
+          'has_native_resultdb_integration'
+        ],
+        'test_suites': {
+          'gtest_tests': 'more_configs_tests',
+        },
+      },
       'android_arm_rel': {
         'mixins': [
           'bullhead', 'marshmallow', 'android-devices', 'logdog-butler',
@@ -248,6 +281,7 @@
           'isolated_scripts': 'linux_tests',
         },
       },
+      'linux_libfuzzer_rel': {},
       'linux_memcheck': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
@@ -255,6 +289,13 @@
           'isolated_scripts': 'linux_tests',
         },
       },
+      'linux_more_configs': {
+        'os_type': 'linux',
+        'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
+        'test_suites': {
+          'isolated_scripts': 'more_configs_tests',
+        },
+      },
       'linux_msan': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
@@ -387,6 +428,13 @@
           'isolated_scripts': 'win_tests_tryserver',
         },
       },
+      'win_x86_more_configs': {
+        'os_type': 'win',
+        'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
+        'test_suites': {
+          'isolated_scripts': 'more_configs_tests',
+        },
+      },
     },
   },
 ]