diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index 3cc8bc330d..5e0bfc826a 100644
--- a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -192,7 +192,13 @@ class TestVp8Impl : public ::testing::Test {
   VideoCodec codec_inst_;
 };
 
+// Disabled on MemorySanitizer as it's breaking on generic libvpx.
+// https://code.google.com/p/webrtc/issues/detail?id=3904
+#if defined(MEMORY_SANITIZER)
+TEST_F(TestVp8Impl, DISABLED_BaseUnitTest) {
+#else
 TEST_F(TestVp8Impl, DISABLED_ON_ANDROID(BaseUnitTest)) {
+#endif
   // TODO(mikhal): Remove dependency. Move all test code here.
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, encoder_->Release());
   UnitTest unittest;