diff --git a/README.chromium b/README.chromium
index 73080d93e..d162d537e 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 813
+Version: 814
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index cd645723d..fed1414eb 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 813
+#define LIBYUV_VERSION 814
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc
index 7502a5653..9a959a194 100644
--- a/unit_test/scale_argb_test.cc
+++ b/unit_test/scale_argb_test.cc
@@ -230,26 +230,26 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3)
 #undef TEST_FACTOR1
 #undef TEST_FACTOR
 
-#define TEST_SCALETO1(width, height, filter, max_diff)                         \
-    TEST_F(libyuvTest, ARGBScaleTo##width##x##height##_##filter) {             \
+#define TEST_SCALETO1(name, width, height, filter, max_diff)                   \
+    TEST_F(libyuvTest, name##To##width##x##height##_##filter) {                \
       int diff = ARGBTestFilter(benchmark_width_, benchmark_height_,           \
                                 width, height,                                 \
                                 kFilter##filter, benchmark_iterations_);       \
       EXPECT_LE(diff, max_diff);                                               \
     }                                                                          \
-    TEST_F(libyuvTest, ARGBScaleFrom##width##x##height##_##filter) {           \
+    TEST_F(libyuvTest, name##From##width##x##height##_##filter) {              \
       int diff = ARGBTestFilter(width, height,                                 \
                                 Abs(benchmark_width_), Abs(benchmark_height_), \
                                 kFilter##filter, benchmark_iterations_);       \
       EXPECT_LE(diff, max_diff);                                               \
     }                                                                          \
-    TEST_F(libyuvTest, ARGBScaleClipTo##width##x##height##_##filter) {         \
+    TEST_F(libyuvTest, name##ClipTo##width##x##height##_##filter) {            \
       int diff = ARGBClipTestFilter(benchmark_width_, benchmark_height_,       \
                                 width, height,                                 \
                                 kFilter##filter, benchmark_iterations_);       \
       EXPECT_LE(diff, max_diff);                                               \
     }                                                                          \
-    TEST_F(libyuvTest, ARGBScaleClipFrom##width##x##height##_##filter) {       \
+    TEST_F(libyuvTest, name##ClipFrom##width##x##height##_##filter) {          \
       int diff = ARGBClipTestFilter(width, height,                             \
                                 Abs(benchmark_width_), Abs(benchmark_height_), \
                                 kFilter##filter, benchmark_iterations_);       \
@@ -257,16 +257,17 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3)
     }
 
 // Test scale to a specified size with all 3 filters.
-#define TEST_SCALETO(width, height)                                            \
-    TEST_SCALETO1(width, height, None, 0)                                      \
-    TEST_SCALETO1(width, height, Bilinear, 2)
+#define TEST_SCALETO(name, width, height)                                      \
+    TEST_SCALETO1(name, width, height, None, 0)                                \
+    TEST_SCALETO1(name, width, height, Bilinear, 2)                            \
+    TEST_SCALETO1(name, width, height, Box, 2)
 
-TEST_SCALETO(640, 360)
-TEST_SCALETO(853, 480)
-TEST_SCALETO(1280, 720)
-TEST_SCALETO(1280, 800)
-TEST_SCALETO(1366, 768)
-TEST_SCALETO(1920, 1080)
+TEST_SCALETO(DISABLED_ARGBScale, 640, 360)
+TEST_SCALETO(ARGBScale, 853, 480)
+TEST_SCALETO(DISABLED_ARGBScale, 1280, 720)
+TEST_SCALETO(DISABLED_ARGBScale, 1280, 800)
+TEST_SCALETO(DISABLED_ARGBScale, 1366, 768)
+TEST_SCALETO(DISABLED_ARGBScale, 1920, 1080)
 #undef TEST_SCALETO1
 #undef TEST_SCALETO
 
diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc
index bc0b598d3..3f1c655b9 100644
--- a/unit_test/scale_test.cc
+++ b/unit_test/scale_test.cc
@@ -162,14 +162,14 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3)
 #undef TEST_FACTOR1
 #undef TEST_FACTOR
 
-#define TEST_SCALETO1(width, height, filter, max_diff)                         \
-    TEST_F(libyuvTest, ScaleTo##width##x##height##_##filter) {                 \
+#define TEST_SCALETO1(name, width, height, filter, max_diff)                   \
+    TEST_F(libyuvTest, name##To##width##x##height##_##filter) {                 \
       int diff = TestFilter(benchmark_width_, benchmark_height_,               \
                             width, height,                                     \
                             kFilter##filter, benchmark_iterations_);           \
       EXPECT_LE(diff, max_diff);                                               \
     }                                                                          \
-    TEST_F(libyuvTest, ScaleFrom##width##x##height##_##filter) {               \
+    TEST_F(libyuvTest, name##From##width##x##height##_##filter) {               \
       int diff = TestFilter(width, height,                                     \
                             Abs(benchmark_width_), Abs(benchmark_height_),     \
                             kFilter##filter, benchmark_iterations_);           \
@@ -177,17 +177,17 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3)
     }
 
 // Test scale to a specified size with all 3 filters.
-#define TEST_SCALETO(width, height)                                            \
-    TEST_SCALETO1(width, height, None, 0)                                      \
-    TEST_SCALETO1(width, height, Bilinear, 2)                                  \
-    TEST_SCALETO1(width, height, Box, 2)                                       \
+#define TEST_SCALETO(name, width, height)                                      \
+    TEST_SCALETO1(name, width, height, None, 0)                                \
+    TEST_SCALETO1(name, width, height, Bilinear, 2)                            \
+    TEST_SCALETO1(name, width, height, Box, 2)
 
-TEST_SCALETO(640, 360)
-TEST_SCALETO(853, 480)
-TEST_SCALETO(1280, 720)
-TEST_SCALETO(1280, 800)
-TEST_SCALETO(1366, 768)
-TEST_SCALETO(1920, 1080)
+TEST_SCALETO(DISABLED_Scale, 640, 360)
+TEST_SCALETO(Scale, 853, 480)
+TEST_SCALETO(DISABLED_Scale, 1280, 720)
+TEST_SCALETO(DISABLED_Scale, 1280, 800)
+TEST_SCALETO(DISABLED_Scale, 1366, 768)
+TEST_SCALETO(DISABLED_Scale, 1920, 1080)
 #undef TEST_SCALETO1
 #undef TEST_SCALETO