diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index 810cb51..f6b0211 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -105,26 +105,5 @@
     test_search(reporter);
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-namespace skiatest {
-    
-    class UtfTest : public Test {
-    public:
-        static Test* Factory(void*) {
-            return SkNEW(UtfTest);
-        }
-        
-    protected:
-        virtual void onGetName(SkString* name) {
-            name->set("UTF");
-        }
-        
-        virtual void onRun(Reporter* reporter) {
-            TestUTF(reporter);
-        }
-    };
-    
-    static TestRegistry gReg(UtfTest::Factory);
-}
-
+#include "TestClassDef.h"
+DEFINE_TESTCLASS("UTF", UtfTestClass, TestUTF)