diff --git a/src/common_video/libyuv/libyuv_unittest.cc b/src/common_video/libyuv/libyuv_unittest.cc
index 07225ec8c8..3b30dd3778 100644
--- a/src/common_video/libyuv/libyuv_unittest.cc
+++ b/src/common_video/libyuv/libyuv_unittest.cc
@@ -194,7 +194,10 @@ TEST_F(TestLibYuv, ConvertTest) {
   delete [] orig_buffer;
 }
 
-TEST_F(TestLibYuv, MirrorTest) {
+// TODO(holmer): Disabled for now due to crashes on Linux 32 bit. The theory
+// is that it crashes due to the fact that the buffers are not 16 bit aligned.
+// See http://code.google.com/p/webrtc/issues/detail?id=335 for more info.
+TEST_F(TestLibYuv, DISABLED_MirrorTest) {
   // TODO (mikhal): Add an automated test to confirm output.
   std::string str;
   int width = 16;