diff --git a/gm/path_stroke_with_zero_length.cpp b/gm/path_stroke_with_zero_length.cpp
index ab9273626c..c69fe5c0c7 100644
--- a/gm/path_stroke_with_zero_length.cpp
+++ b/gm/path_stroke_with_zero_length.cpp
@@ -91,7 +91,7 @@ protected:
                 if (indexMask & (1 << index)) {
                     canvas->drawPath(path, paint);
                 }
-                if (paint.getStrokeWidth() < 2) {
+                if (this->getMode() == skiagm::GM::kSample_Mode && paint.getStrokeWidth() < 2) {
                     drawFat(canvas, path, paint, index);
                 }
                 ++index;
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 710050e289..d986f1df8c 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -137,10 +137,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -161,18 +157,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -317,10 +301,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -341,18 +321,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -594,10 +562,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -618,18 +582,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -869,10 +821,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -893,18 +841,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -1147,10 +1083,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -1171,18 +1103,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -1418,10 +1338,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -1442,18 +1358,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -1691,10 +1595,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -1715,18 +1615,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -1960,10 +1848,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -1984,18 +1868,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -2176,10 +2048,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -2200,18 +2068,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -2485,10 +2341,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -2509,18 +2361,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -2670,10 +2510,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -2694,18 +2530,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -2858,10 +2682,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -2882,18 +2702,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -3063,10 +2871,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -3087,18 +2891,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -3267,10 +3059,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -3291,18 +3079,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
@@ -3597,10 +3373,6 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "serialize-8888", 
-    "gm", 
-    "_", 
     "verylargebitmap", 
     "serialize-8888", 
     "gm", 
@@ -3621,18 +3393,6 @@
     "sp-8888", 
     "gm", 
     "_", 
-    "path_stroke_with_zero_length", 
-    "pic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "2ndpic-8888", 
-    "gm", 
-    "_", 
-    "path_stroke_with_zero_length", 
-    "sp-8888", 
-    "gm", 
-    "_", 
     "patch_primitive", 
     "sp-8888", 
     "gm", 
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 5704deceaf..b7a24bba8c 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -168,13 +168,11 @@ def get_args(bot):
                'fontmgr_match',
                'fontmgr_iter',
                'lightingshader',
-               'path_stroke_with_zero_length',
                'verylargebitmap',              # Windows only.
                'verylarge_picture_image']:     # Windows only.
     blacklist.extend(['serialize-8888', 'gm', '_', test])
   # skia:4769
-  for test in ['drawfilter',
-               'path_stroke_with_zero_length']:
+  for test in ['drawfilter']:
     blacklist.extend([    'sp-8888', 'gm', '_', test])
     blacklist.extend([   'pic-8888', 'gm', '_', test])
     blacklist.extend(['2ndpic-8888', 'gm', '_', test])