diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 7a9364f..efdad3a 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -188,7 +188,7 @@
 
 static void unittest_isfinite(skiatest::Reporter* reporter) {
 #ifdef SK_SCALAR_IS_FLOAT
-    float nan = ::asin(2);
+    float nan = sk_float_asin(2);
     float inf = 1.0 / make_zero();
     float big = 3.40282e+038;
 
diff --git a/tests/Reader32Test.cpp b/tests/Reader32Test.cpp
index c752b0f..cad2d33 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -52,7 +52,9 @@
 
     const int32_t data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
     const SkScalar data2[] = { 0, SK_Scalar1, -SK_Scalar1, SK_Scalar1/2 };
-    char buffer[SkMax32(sizeof(data), sizeof(data2))];
+    const size_t bufsize = sizeof(data) > sizeof(data2) ?
+      sizeof(data) : sizeof(data2);
+    char buffer[bufsize];
 
     reader.setMemory(data, sizeof(data));
     for (i = 0; i < SK_ARRAY_COUNT(data); ++i) {