diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 6bbadbd5fc..caaf397fce 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -8831,7 +8831,6 @@
       },
       {
         "args": [
-          "--readline-timeout=360",
           "--platform",
           "iPhone X",
           "--version",
@@ -9683,7 +9682,6 @@
       },
       {
         "args": [
-          "--readline-timeout=360",
           "--platform",
           "iPhone X",
           "--version",
@@ -10535,7 +10533,6 @@
       },
       {
         "args": [
-          "--readline-timeout=360",
           "--platform",
           "iPhone X",
           "--version",
diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json
index 07339ffcc5..8786d51a15 100644
--- a/infra/specs/internal.client.webrtc.json
+++ b/infra/specs/internal.client.webrtc.json
@@ -89,6 +89,7 @@
       },
       {
         "args": [
+          "--readline-timeout=1200",
           "--xctest",
           "--undefok=enable-run-ios-unittests-with-xctest",
           "--xcode-build-version",
@@ -119,6 +120,8 @@
               "pool": "chrome.tests"
             }
           ],
+          "hard_timeout": 7200,
+          "io_timeout": 7200,
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -608,6 +611,7 @@
       },
       {
         "args": [
+          "--readline-timeout=1200",
           "--xctest",
           "--undefok=enable-run-ios-unittests-with-xctest",
           "--xcode-build-version",
@@ -638,6 +642,8 @@
               "pool": "chrome.tests"
             }
           ],
+          "hard_timeout": 7200,
+          "io_timeout": 7200,
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
diff --git a/infra/specs/internal.tryserver.webrtc.json b/infra/specs/internal.tryserver.webrtc.json
index 25fef7534f..6f57f68027 100644
--- a/infra/specs/internal.tryserver.webrtc.json
+++ b/infra/specs/internal.tryserver.webrtc.json
@@ -89,6 +89,7 @@
       },
       {
         "args": [
+          "--readline-timeout=1200",
           "--xctest",
           "--undefok=enable-run-ios-unittests-with-xctest",
           "--xcode-build-version",
@@ -119,6 +120,8 @@
               "pool": "chrome.tests"
             }
           ],
+          "hard_timeout": 7200,
+          "io_timeout": 7200,
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
@@ -555,6 +558,7 @@
       },
       {
         "args": [
+          "--readline-timeout=1200",
           "--xctest",
           "--undefok=enable-run-ios-unittests-with-xctest",
           "--xcode-build-version",
@@ -585,6 +589,8 @@
               "pool": "chrome.tests"
             }
           ],
+          "hard_timeout": 7200,
+          "io_timeout": 7200,
           "named_caches": [
             {
               "name": "xcode_ios_13c100",
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 6fd6e3be73..61f29e3325 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -269,6 +269,12 @@
       }
     }
   },
+  'timeout-2h': {
+    'swarming': {
+      'hard_timeout': 7200,
+      'io_timeout': 7200
+    }
+  },
   'timeout-3h': {
     'swarming': {
       'hard_timeout': 10800,
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 6037e4ffa2..1e3de82c75 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -207,6 +207,12 @@
       },
     },
   },
+  'timeout-2h': {
+    'swarming': {
+      'hard_timeout': 7200,
+      'io_timeout': 7200,
+    },
+  },
   'timeout-3h': {
     'swarming': {
       'hard_timeout': 10800,
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index 2b4a0bbb98..008042137a 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -128,7 +128,13 @@
       #'apprtcmobile_tests': {'mixins': ['xcodebuild-device-runner']},
       'common_audio_unittests': {},
       'common_video_unittests': {},
-      'modules_tests': {},
+      'modules_tests': {
+        'mixins': ['timeout-2h'],
+        'args': [
+          # Some tests exceed the default 180 seconds readline timeout.
+          '--readline-timeout=1200',
+        ]
+      },
       'modules_unittests': {},
       'rtc_pc_unittests': {},
       'rtc_stats_unittests': {},
@@ -155,12 +161,7 @@
       'common_audio_unittests': {},
       'common_video_unittests': {},
       'dcsctp_unittests': {},
-      'modules_tests': {
-        'args': [
-          # Some tests exceed the default 180 seconds readline timeout.
-          '--readline-timeout=360',
-        ],
-      },
+      'modules_tests': {},
       'modules_unittests': {},
       'rtc_media_unittests': {},
       'rtc_pc_unittests': {},
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 194ab92dc7..15e9958bf4 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -2778,7 +2778,6 @@
       },
       {
         "args": [
-          "--readline-timeout=360",
           "--platform",
           "iPhone X",
           "--version",
@@ -3630,7 +3629,6 @@
       },
       {
         "args": [
-          "--readline-timeout=360",
           "--platform",
           "iPhone X",
           "--version",
@@ -4482,7 +4480,6 @@
       },
       {
         "args": [
-          "--readline-timeout=360",
           "--platform",
           "iPhone X",
           "--version",