diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index c5aa9a1ddc..6169bbc7e9 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -37,6 +37,7 @@ def main():
     'common_video_unittests',
     'modules_tests',
     'modules_unittests',
+    'rtc_unittests',
     'system_wrappers_unittests',
     'test_support_unittests',
     'tools_unittests',
@@ -58,6 +59,7 @@ def main():
         'webrtc/common_video/common_video_unittests.isolate',
     'modules_tests': 'webrtc/modules/modules_tests.isolate',
     'modules_unittests': 'webrtc/modules/modules_unittests.isolate',
+    'rtc_unittests': 'webrtc/rtc_unittests.isolate',
     'system_wrappers_unittests':
         'webrtc/system_wrappers/system_wrappers_unittests.isolate',
     'test_support_unittests': 'webrtc/test/test_support_unittests.isolate',
diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/apk_tests.gyp
index 4c699fd0a1..3e1ff397ae 100644
--- a/webrtc/build/apk_tests.gyp
+++ b/webrtc/build/apk_tests.gyp
@@ -88,6 +88,20 @@
         '../../build/apk_test.gypi',
       ],
     },
+    {
+      'target_name': 'rtc_unittests_apk',
+      'type': 'none',
+      'variables': {
+        'test_suite_name': 'rtc_unittests',
+        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)rtc_unittests<(SHARED_LIB_SUFFIX)',
+      },
+      'dependencies': [
+        '<(webrtc_root)/webrtc.gyp:rtc_unittests',
+      ],
+      'includes': [
+        '../../build/apk_test.gypi',
+      ],
+    },
     {
       'target_name': 'system_wrappers_unittests_apk',
       'type': 'none',
diff --git a/webrtc/build/apk_tests_noop.gyp b/webrtc/build/apk_tests_noop.gyp
index 3523e79bb1..7c1a6aa924 100644
--- a/webrtc/build/apk_tests_noop.gyp
+++ b/webrtc/build/apk_tests_noop.gyp
@@ -29,6 +29,10 @@
       'target_name': 'modules_unittests_apk',
       'type': 'none',
     },
+    {
+      'target_name': 'rtc_unittests_apk',
+      'type': 'none',
+    },
     {
       'target_name': 'system_wrappers_unittests_apk',
       'type': 'none',
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index 835062d90c..c0b3c038f0 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -9,7 +9,7 @@
   'targets': [
     {
       'target_name': 'rtc_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'dependencies': [
         'base/base.gyp:rtc_base',
         'base/base_tests.gyp:rtc_base_tests_utils',
@@ -24,6 +24,13 @@
         'sound/sound.gyp:rtc_sound',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
+      'conditions': [
+        ['OS=="android"', {
+          'dependencies': [
+            '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'webrtc_tests',
@@ -202,6 +209,13 @@
   'conditions': [
     ['OS=="android"', {
       'targets': [
+        {
+          'target_name': 'rtc_unittests_apk_target',
+          'type': 'none',
+          'dependencies': [
+            '<(apk_tests_path):rtc_unittests_apk',
+          ],
+        },
         {
           'target_name': 'video_engine_tests_apk_target',
           'type': 'none',