diff --git a/experimental/sktext/tests/SelectableText.cpp b/experimental/sktext/tests/SelectableText.cpp
index 2be4b546ba..8692eed5aa 100644
--- a/experimental/sktext/tests/SelectableText.cpp
+++ b/experimental/sktext/tests/SelectableText.cpp
@@ -37,11 +37,14 @@ struct GrContextOptions;
 #define TestCanvasHeight 600
 
 #if !defined(SK_BUILD_FOR_UNIX)
-#define DEF_TEST(name, reporter) \
-static void test_##name(skiatest::Reporter* reporter, const GrContextOptions&); \
-skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
-void test_##name(skiatest::Reporter* reporter, const GrContextOptions&) { /* SkDebugf("Disabled:"#name "\n"); */ } \
-void disabled_##name(skiatest::Reporter* reporter, const GrContextOptions&)
+#undef DEF_TEST
+#define DEF_TEST(name, reporter)                                                          \
+    static void test_##name(skiatest::Reporter* reporter, const GrContextOptions&);       \
+    skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
+    void test_##name(skiatest::Reporter* reporter, const GrContextOptions&) {             \
+        /* SkDebugf("Disabled:"#name "\n"); */                                            \
+    }                                                                                     \
+    void disabled_##name(skiatest::Reporter* reporter, const GrContextOptions&)
 #endif
 
 using namespace skia::text;
diff --git a/experimental/sktext/tests/ShapedText.cpp b/experimental/sktext/tests/ShapedText.cpp
index 207002b5ad..d26272f85a 100644
--- a/experimental/sktext/tests/ShapedText.cpp
+++ b/experimental/sktext/tests/ShapedText.cpp
@@ -37,11 +37,14 @@ struct GrContextOptions;
 #define TestCanvasHeight 600
 
 #if !defined(SK_BUILD_FOR_UNIX)
-#define DEF_TEST(name, reporter) \
-static void test_##name(skiatest::Reporter* reporter, const GrContextOptions&); \
-skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
-void test_##name(skiatest::Reporter* reporter, const GrContextOptions&) { /* SkDebugf("Disabled:"#name "\n"); */ } \
-void disabled_##name(skiatest::Reporter* reporter, const GrContextOptions&)
+#undef DEF_TEST
+#define DEF_TEST(name, reporter)                                                          \
+    static void test_##name(skiatest::Reporter* reporter, const GrContextOptions&);       \
+    skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
+    void test_##name(skiatest::Reporter* reporter, const GrContextOptions&) {             \
+        /* SkDebugf("Disabled:"#name "\n"); */                                            \
+    }                                                                                     \
+    void disabled_##name(skiatest::Reporter* reporter, const GrContextOptions&)
 #endif
 
 using namespace skia::text;
diff --git a/experimental/sktext/tests/UnicodeText.cpp b/experimental/sktext/tests/UnicodeText.cpp
index 68368e90de..8140b4ecac 100644
--- a/experimental/sktext/tests/UnicodeText.cpp
+++ b/experimental/sktext/tests/UnicodeText.cpp
@@ -36,11 +36,14 @@ struct GrContextOptions;
 #define TestCanvasHeight 600
 
 #if !defined(SK_BUILD_FOR_UNIX)
-#define DEF_TEST(name, reporter) \
-static void test_##name(skiatest::Reporter* reporter, const GrContextOptions&); \
-skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
-void test_##name(skiatest::Reporter* reporter, const GrContextOptions&) { /* SkDebugf("Disabled:"#name "\n"); */ } \
-void disabled_##name(skiatest::Reporter* reporter, const GrContextOptions&)
+#undef DEF_TEST
+#define DEF_TEST(name, reporter)                                                          \
+    static void test_##name(skiatest::Reporter* reporter, const GrContextOptions&);       \
+    skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
+    void test_##name(skiatest::Reporter* reporter, const GrContextOptions&) {             \
+        /* SkDebugf("Disabled:"#name "\n"); */                                            \
+    }                                                                                     \
+    void disabled_##name(skiatest::Reporter* reporter, const GrContextOptions&)
 #endif
 
 using namespace skia::text;
diff --git a/experimental/sktext/tests/WrappedText.cpp b/experimental/sktext/tests/WrappedText.cpp
index 247599c537..ca70b90083 100644
--- a/experimental/sktext/tests/WrappedText.cpp
+++ b/experimental/sktext/tests/WrappedText.cpp
@@ -37,11 +37,14 @@ struct GrContextOptions;
 #define TestCanvasHeight 600
 
 #if !defined(SK_BUILD_FOR_UNIX)
-#define DEF_TEST(name, reporter) \
-static void test_##name(skiatest::Reporter* reporter, const GrContextOptions&); \
-skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
-void test_##name(skiatest::Reporter* reporter, const GrContextOptions&) { /* SkDebugf("Disabled:"#name "\n"); */ } \
-void disabled_##name(skiatest::Reporter* reporter, const GrContextOptions&)
+#undef DEF_TEST
+#define DEF_TEST(name, reporter)                                                          \
+    static void test_##name(skiatest::Reporter* reporter, const GrContextOptions&);       \
+    skiatest::TestRegistry name##TestRegistry(skiatest::Test(#name, false, test_##name)); \
+    void test_##name(skiatest::Reporter* reporter, const GrContextOptions&) {             \
+        /* SkDebugf("Disabled:"#name "\n"); */                                            \
+    }                                                                                     \
+    void disabled_##name(skiatest::Reporter* reporter, const GrContextOptions&)
 #endif
 using namespace skia::text;