diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index 7ae06d7..bb05432 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -5,6 +5,8 @@
  * found in the LICENSE file.
  */
 
+#include "Test.h"
+#include "TestClassDef.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
@@ -12,7 +14,6 @@
 #include "SkOrderedWriteBuffer.h"
 #include "SkValidatingReadBuffer.h"
 #include "SkXfermodeImageFilter.h"
-#include "Test.h"
 
 static const uint32_t kArraySize = 64;
 
@@ -232,7 +233,7 @@
     }
 }
 
-static void Tests(skiatest::Reporter* reporter) {
+DEF_TEST(Serialization, reporter) {
     // Test matrix serialization
     {
         SkMatrix matrix = SkMatrix::I();
@@ -316,6 +317,3 @@
         TestBitmapSerialization(validBitmap, invalidBitmap2, false, reporter);
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Serialization", SerializationClass, Tests)