diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/vp8_unittest.cc
rename to webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
index faa2fb2281..8471a07e2d 100644
--- a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
@@ -107,6 +107,7 @@
             'test/rps_test.cc',
             'test/tester.cc',
             'test/vp8_unittest.cc',
+            'test/vp8_impl_unittest.cc',
           ],
         },
         {
@@ -125,7 +126,6 @@
           'sources': [
             'reference_picture_selection_unittest.cc',
             'temporal_layers_unittest.cc',
-            'vp8_unittest.cc',
           ],
           'conditions': [
             ['build_libvpx==1', {