diff --git a/webrtc/test/webrtc_test_common.gyp b/webrtc/test/webrtc_test_common.gyp
index eac8b97ec6..6920ab8437 100644
--- a/webrtc/test/webrtc_test_common.gyp
+++ b/webrtc/test/webrtc_test_common.gyp
@@ -30,14 +30,6 @@
         'flags.h',
         'frame_generator_capturer.cc',
         'frame_generator_capturer.h',
-        'gl/gl_renderer.cc',
-        'gl/gl_renderer.h',
-        'linux/glx_renderer.cc',
-        'linux/glx_renderer.h',
-        'linux/video_renderer_linux.cc',
-        'mac/run_tests.mm',
-        'mac/video_renderer_mac.h',
-        'mac/video_renderer_mac.mm',
         'mock_transport.h',
         'null_platform_renderer.cc',
         'null_transport.cc',
@@ -55,35 +47,10 @@
         'video_capturer.h',
         'video_renderer.cc',
         'video_renderer.h',
-        'win/d3d_renderer.cc',
-        'win/d3d_renderer.h',
-        'win/run_loop_win.cc',
-      ],
-      'conditions': [
-        ['OS=="linux"', {
-          'sources!': [
-            'null_platform_renderer.cc',
-          ],
-        }],
-        ['OS=="mac"', {
-          'sources!': [
-            'null_platform_renderer.cc',
-            'run_tests.cc',
-          ],
-        }],
-        ['OS!="linux" and OS!="mac"', {
-          'sources!' : [
-            'gl/gl_renderer.cc',
-            'gl/gl_renderer.h',
-          ],
-        }],
-        ['OS=="win"', {
-          'sources!': [
-            'null_platform_renderer.cc',
-            'run_loop.cc',
-          ],
-        }],
       ],
+      # TODO(pbos): As far as I can tell these are dependencies from
+      # video_render and they should really not be here. This target provides
+      # no platform-specific rendering.
       'direct_dependent_settings': {
         'conditions': [
           ['OS=="linux"', {
@@ -93,9 +60,6 @@
               '-lGL',
             ],
           }],
-          #TODO(pbos) : These dependencies should not have to be here, they
-          #             aren't used by test code directly, only by components
-          #             used by the tests.
           ['OS=="android"', {
             'libraries' : [
               '-lGLESv2', '-llog',
diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc
index 1181bfe488..9b0def6f83 100644
--- a/webrtc/video/full_stack.cc
+++ b/webrtc/video/full_stack.cc
@@ -27,7 +27,6 @@
 #include "webrtc/test/direct_transport.h"
 #include "webrtc/test/frame_generator_capturer.h"
 #include "webrtc/test/statistics.h"
-#include "webrtc/test/video_renderer.h"
 #include "webrtc/typedefs.h"
 
 DEFINE_int32(seconds, 10, "Seconds to run each clip.");