diff --git a/gyp/tests.gypi b/gyp/tests.gypi
index 9876f18..35431bd 100644
--- a/gyp/tests.gypi
+++ b/gyp/tests.gypi
@@ -155,12 +155,13 @@
     '../tests/RoundRectTest.cpp',
     '../tests/RuntimeConfigTest.cpp',
     '../tests/SHA1Test.cpp',
+    '../tests/SListTest.cpp',
     '../tests/ScalarTest.cpp',
     '../tests/SerializationTest.cpp',
     '../tests/ShaderImageFilterTest.cpp',
     '../tests/ShaderOpacityTest.cpp',
+    '../tests/SizeTest.cpp',
     '../tests/SkBase64Test.cpp',
-    '../tests/SListTest.cpp',
     '../tests/SmallAllocatorTest.cpp',
     '../tests/SortTest.cpp',
     '../tests/SrcOverTest.cpp',
@@ -171,7 +172,6 @@
     '../tests/TArrayTest.cpp',
     '../tests/TLSTest.cpp',
     '../tests/TSetTest.cpp',
-    '../tests/TestSize.cpp',
     '../tests/TextureCompressionTest.cpp',
     '../tests/TileGridTest.cpp',
     '../tests/ToUnicodeTest.cpp',
diff --git a/tests/TestSize.cpp b/tests/SizeTest.cpp
similarity index 94%
rename from tests/TestSize.cpp
rename to tests/SizeTest.cpp
index 466a628..9800aa2 100644
--- a/tests/TestSize.cpp
+++ b/tests/SizeTest.cpp
@@ -6,9 +6,10 @@
  */
 
 #include "SkSize.h"
+
 #include "Test.h"
 
-static void TestISize(skiatest::Reporter* reporter) {
+DEF_TEST(ISize, reporter) {
     SkISize  a, b;
 
     a.set(0, 0);
@@ -31,8 +32,6 @@
 }
 
 DEF_TEST(Size, reporter) {
-    TestISize(reporter);
-
     SkSize a, b;
     int ix = 5;
     int iy = 3;