diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index 799698201b..5b3f3d9e74 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -48,8 +48,6 @@ def main():
     'video_capture_tests':
         'webrtc/modules/video_capture/video_capture_tests.isolate',
     'video_engine_tests': 'webrtc/video_engine_tests.isolate',
-    'video_engine_core_unittests':
-        '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',
diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/apk_tests.gyp
index a3833ff524..fe05c0848a 100644
--- a/webrtc/build/apk_tests.gyp
+++ b/webrtc/build/apk_tests.gyp
@@ -145,20 +145,6 @@
         '../../build/apk_test.gypi',
       ],
     },
-    {
-      'target_name': 'video_engine_core_unittests_apk',
-      'type': 'none',
-      'variables': {
-        'test_suite_name': 'video_engine_core_unittests',
-        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_core_unittests<(SHARED_LIB_SUFFIX)',
-      },
-      'dependencies': [
-        '<(webrtc_root)/video_engine/video_engine_core_unittests.gyp:video_engine_core_unittests',
-      ],
-      'includes': [
-        '../../build/apk_test.gypi',
-      ],
-    },
     {
       'target_name': 'video_engine_tests_apk',
       'type': 'none',
diff --git a/webrtc/build/apk_tests_noop.gyp b/webrtc/build/apk_tests_noop.gyp
index 719bddb854..489f2eea63 100644
--- a/webrtc/build/apk_tests_noop.gyp
+++ b/webrtc/build/apk_tests_noop.gyp
@@ -45,10 +45,6 @@
       'target_name': 'tools_unittests_apk',
       'type': 'none',
     },
-    {
-      'target_name': 'video_engine_core_unittests_apk',
-      'type': 'none',
-    },
     {
       'target_name': 'video_engine_tests_apk',
       'type': 'none',
diff --git a/webrtc/video_engine/video_engine_core_unittests.gyp b/webrtc/video_engine/video_engine_core_unittests.gyp
deleted file mode 100644
index d0143442b4..0000000000
--- a/webrtc/video_engine/video_engine_core_unittests.gyp
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'includes': [
-    '../build/common.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'video_engine_core_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '<(webrtc_root)/webrtc.gyp:webrtc',
-        '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
-        '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(webrtc_root)/test/test.gyp:test_support_main',
-      ],
-      'sources': [
-        'call_stats_unittest.cc',
-        'encoder_state_feedback_unittest.cc',
-        'overuse_frame_detector_unittest.cc',
-        'payload_router_unittest.cc',
-        'report_block_stats_unittest.cc',
-        'stream_synchronization_unittest.cc',
-        'vie_codec_unittest.cc',
-        'vie_remb_unittest.cc',
-      ],
-      'conditions': [
-        ['OS=="android"', {
-          'dependencies': [
-            '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-      ],
-    },
-  ], # targets
-  'conditions': [
-    ['OS=="android"', {
-      'targets': [
-        {
-          'target_name': 'video_engine_core_unittests_apk_target',
-          'type': 'none',
-          'dependencies': [
-            '<(apk_tests_path):video_engine_core_unittests_apk',
-          ],
-        },
-      ],
-    }],
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'video_engine_core_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'video_engine_core_unittests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-          ],
-          'sources': [
-            'video_engine_core_unittests.isolate',
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/webrtc/video_engine/video_engine_core_unittests.isolate b/webrtc/video_engine/video_engine_core_unittests.isolate
deleted file mode 100644
index c8d2fc9026..0000000000
--- a/webrtc/video_engine/video_engine_core_unittests.isolate
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2013 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': [
-          '<(DEPTH)/testing/test_env.py',
-          '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'files': [
-          '<(DEPTH)/testing/test_env.py',
-          '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp
index 75ed645106..0299623850 100644
--- a/webrtc/webrtc.gyp
+++ b/webrtc/webrtc.gyp
@@ -86,7 +86,6 @@
             'test/metrics.gyp:*',
             'test/test.gyp:*',
             'test/webrtc_test_common.gyp:*',
-            'video_engine/video_engine_core_unittests.gyp:*',
             'webrtc_tests',
           ],
         }],
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index cd51bc9311..4b8a6d9af1 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -166,6 +166,14 @@
         'video/video_decoder_unittest.cc',
         'video/video_encoder_unittest.cc',
         'video/video_send_stream_tests.cc',
+        'video_engine/call_stats_unittest.cc',
+        'video_engine/encoder_state_feedback_unittest.cc',
+        'video_engine/overuse_frame_detector_unittest.cc',
+        'video_engine/payload_router_unittest.cc',
+        'video_engine/report_block_stats_unittest.cc',
+        'video_engine/stream_synchronization_unittest.cc',
+        'video_engine/vie_codec_unittest.cc',
+        'video_engine/vie_remb_unittest.cc',
       ],
       'dependencies': [
         '<(DEPTH)/testing/gmock.gyp:gmock',