diff --git a/webrtc/modules/video_coding/main/source/video_coding_test.gypi b/webrtc/modules/video_coding/main/source/video_coding_test.gypi
index b453c57af1..c00d56c701 100644
--- a/webrtc/modules/video_coding/main/source/video_coding_test.gypi
+++ b/webrtc/modules/video_coding/main/source/video_coding_test.gypi
@@ -7,12 +7,12 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'targets': [{
-      'target_name': 'video_coding_integrationtests',
+  'targets': [
+    {
+      'target_name': 'video_coding_test',
       'type': 'executable',
       'dependencies': [
          'rtp_rtcp',
-         'video_codecs_test_framework',
          'video_processing',
          'webrtc_video_coding',
          'webrtc_utility',
@@ -63,9 +63,22 @@
         '../test/video_rtp_play_mt.cc',
         '../test/video_rtp_play.cc',
         '../test/video_source.cc',
-        '../../codecs/test/videoprocessor_integrationtest.cc',
       ], # sources
     },
+    {
+      'target_name': 'video_coding_integrationtests',
+      'type': 'executable',
+      'dependencies': [
+         'video_codecs_test_framework',
+         'webrtc_video_coding',
+         '<(DEPTH)/testing/gtest.gyp:gtest',
+         '<(webrtc_root)/test/test.gyp:test_support_main',
+         '<(webrtc_root)/test/metrics.gyp:metrics',
+      ],
+      'sources': [
+        '../../codecs/test/videoprocessor_integrationtest.cc',
+      ],
+    },
     {
       'target_name': 'video_coding_unittests',
       'type': 'executable',
diff --git a/webrtc/modules/video_coding/main/test/tester_main.cc b/webrtc/modules/video_coding/main/test/tester_main.cc
index fc15ac7697..6188cbad16 100644
--- a/webrtc/modules/video_coding/main/test/tester_main.cc
+++ b/webrtc/modules/video_coding/main/test/tester_main.cc
@@ -9,7 +9,6 @@
  */
 
 #include "google/gflags.h"
-#include "gtest/gtest.h"
 
 #include "receiver_tests.h"
 #include "normal_test.h"
@@ -19,7 +18,6 @@
 #include "media_opt_test.h"
 #include "quality_modes_test.h"
 #include "test_util.h"
-#include "webrtc/test/test_suite.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 #include <stdlib.h>
@@ -46,8 +44,6 @@ DEFINE_string(output_filename, webrtc::test::OutputPath() +
 DEFINE_string(fv_output_filename, webrtc::test::OutputPath() +
               "features.txt", "FV output file.");
 DEFINE_int32(test_number, 0, "Test number.");
-DEFINE_bool(run_gtest_tests, true, "Run gtest tests too (after legacy tests has"
-            " executed).");
 
 using namespace webrtc;
 
@@ -99,7 +95,7 @@ int main(int argc, char **argv) {
     return -1;
   }
 
-  printf("Running legacy video coding tests...\n");
+  printf("Running video coding tests...\n");
   int ret = 0;
   switch (args.testNum) {
     case 0:
@@ -146,14 +142,5 @@ int main(int argc, char **argv) {
       ret = -1;
       break;
   }
-  if (ret != 0) {
-    printf("Legacy Tests failed!\n");
-  } else {
-    if (FLAGS_run_gtest_tests) {
-      printf("Running gtest integration tests...\n");
-      webrtc::test::TestSuite test_suite(argc, argv);
-      ret = test_suite.Run();
-    }
-  }
   return ret;
 }