diff --git a/tests/BitSetTest.cpp b/tests/BitSetTest.cpp
index 7139495..bdfe997 100644
--- a/tests/BitSetTest.cpp
+++ b/tests/BitSetTest.cpp
@@ -1,14 +1,15 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkBitSet.h"
 
-static void TestBitSet(skiatest::Reporter* reporter) {
+DEF_TEST(BitSet, reporter) {
     SkBitSet set0(65536);
     REPORTER_ASSERT(reporter, set0.isBitSet(0) == false);
     REPORTER_ASSERT(reporter, set0.isBitSet(32767) == false);
@@ -74,6 +75,3 @@
     set2 = set2;
     REPORTER_ASSERT(reporter, set2 == set3);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("BitSet", BitSetTest, TestBitSet)