diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index f78da572c2..799698201b 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -52,6 +52,7 @@ def main():
         'webrtc/video_engine/video_engine_core_unittests.isolate',
     'voice_engine_unittests':
         'webrtc/voice_engine/voice_engine_unittests.isolate',
+    'webrtc_nonparallel_tests': 'webrtc/webrtc_nonparallel_tests.isolate',
     'webrtc_perf_tests': 'webrtc/webrtc_perf_tests.isolate',
   })
   # Override environment variable to make it possible for the scripts to find
diff --git a/webrtc/build/apk_tests_noop.gyp b/webrtc/build/apk_tests_noop.gyp
index 9a4789f9e8..719bddb854 100644
--- a/webrtc/build/apk_tests_noop.gyp
+++ b/webrtc/build/apk_tests_noop.gyp
@@ -57,6 +57,10 @@
       'target_name': 'voice_engine_unittests_apk',
       'type': 'none',
     },
+    {
+      'target_name': 'webrtc_nonparallel_tests_apk',
+      'type': 'none',
+    },
     {
       'target_name': 'webrtc_perf_tests_apk',
       'type': 'none',
diff --git a/webrtc/webrtc_nonparallel_tests.isolate b/webrtc/webrtc_nonparallel_tests.isolate
new file mode 100644
index 0000000000..0e13d7b3ba
--- /dev/null
+++ b/webrtc/webrtc_nonparallel_tests.isolate
@@ -0,0 +1,21 @@
+# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+{
+  'conditions': [
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '<(PRODUCT_DIR)/webrtc_nonparallel_tests<(EXECUTABLE_SUFFIX)',
+        ],
+        'files': [
+          '<(PRODUCT_DIR)/webrtc_nonparallel_tests<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index 547b99b693..811bbd772f 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -346,6 +346,19 @@
             'video_engine_tests.isolate',
           ],
         },
+        {
+          'target_name': 'webrtc_nonparallel_tests_run',
+          'type': 'none',
+          'dependencies': [
+            'webrtc_nonparallel_tests',
+          ],
+          'includes': [
+            'build/isolate.gypi',
+          ],
+          'sources': [
+            'webrtc_nonparallel_tests.isolate',
+          ],
+        },
         {
           'target_name': 'webrtc_perf_tests_run',
           'type': 'none',