diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 1e4e341..659672a 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -94,26 +94,5 @@
     }
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-namespace skiatest {
-
-    class MatrixTest : public Test {
-    public:
-        static Test* Factory(void*) {
-            return SkNEW(MatrixTest);
-        }
-
-    protected:
-        virtual void onGetName(SkString* name) {
-            name->set("Matrix");
-        }
-        
-        virtual void onRun(Reporter* reporter) {
-            TestMatrix(reporter);
-        }
-    };
-
-    static TestRegistry gReg(MatrixTest::Factory);
-}
-
+#include "TestClassDef.h"
+DEFINE_TESTCLASS("Matrix", MatrixTestClass, TestMatrix)