diff --git a/tests/PathOpsQuadIntersectionTest.cpp b/tests/PathOpsQuadIntersectionTest.cpp
index 2ee70ec..8555563 100644
--- a/tests/PathOpsQuadIntersectionTest.cpp
+++ b/tests/PathOpsQuadIntersectionTest.cpp
@@ -226,7 +226,7 @@
     {{{8, 8}, {9, 9}, {10, 8}}}
 };
 
-const size_t testSetCount = sizeof(testSet) / sizeof(testSet[0]);
+const size_t testSetCount = SK_ARRAY_COUNT(testSet);
 
 static void oneOffTest1(skiatest::Reporter* reporter, size_t outer, size_t inner) {
     const SkDQuad& quad1 = testSet[outer];
@@ -271,7 +271,7 @@
     {{{8, -10}, {10, 10}, {8, 8}}},
 };
 
-const size_t coincidentTestSetCount = sizeof(coincidentTestSet) / sizeof(coincidentTestSet[0]);
+const size_t coincidentTestSetCount = SK_ARRAY_COUNT(coincidentTestSet);
 
 static void coincidentTest(skiatest::Reporter* reporter) {
     for (size_t testIndex = 0; testIndex < coincidentTestSetCount - 1; testIndex += 2) {
@@ -453,7 +453,7 @@
     intersectionFinder(0, 1);
 }
 
-static void TestQuadIntersection(skiatest::Reporter* reporter) {
+static void PathOpsQuadIntersectionTest(skiatest::Reporter* reporter) {
     oneOffTests(reporter);
     coincidentTest(reporter);
     standardTestCases(reporter);
@@ -464,4 +464,4 @@
 
 
 #include "TestClassDef.h"
-DEFINE_TESTCLASS("PathOpsQuadIntersection", QuadIntersectionTestClass, TestQuadIntersection)
+DEFINE_TESTCLASS_SHORT(PathOpsQuadIntersectionTest)