diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 7cadf01..57c93ae 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkMatrix.h"
 #include "SkRRect.h"
 
@@ -553,7 +554,7 @@
     }
 }
 
-static void TestRoundRect(skiatest::Reporter* reporter) {
+DEF_TEST(RoundRect, reporter) {
     test_round_rect_basic(reporter);
     test_round_rect_rects(reporter);
     test_round_rect_ovals(reporter);
@@ -563,6 +564,3 @@
     test_round_rect_contains_rect(reporter);
     test_round_rect_transform(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("RoundRect", TestRoundRectClass, TestRoundRect)