diff --git a/test/model_test.dart b/test/model_test.dart
index 9fc8dbda34..e4e1d65e54 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -3079,12 +3079,14 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(typeArguments, isNotEmpty);
       expect(
           typeArguments.last.linkedName,
-          equals(
-              'dynamic Function<span class="signature">(<span class="parameter" id="param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span> <span class="parameter-name">a</span></span><wbr>)</span>'));
+          // TODO(jcollins-g): after analyzer 0.39.5 change to 'num' in first
+          // group.
+          matches(RegExp(
+              r'(dynamic|num) Function<span class="signature">\(<span class="parameter" id="param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span> <span class="parameter-name">a</span></span><wbr>\)</span>')));
       expect(
           importantComputations.linkedReturnType,
-          equals(
-              'Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">dynamic Function<span class="signature">(<span class="parameter" id="param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span> <span class="parameter-name">a</span></span><wbr>)</span></span>&gt;</span>'));
+          matches(RegExp(
+              r'Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(dynamic|num) Function<span class="signature">\(<span class="parameter" id="param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span> <span class="parameter-name">a</span></span><wbr>\)</span></span>&gt;</span>')));
     });
 
     test(
diff --git a/tool/grind.dart b/tool/grind.dart
index 1585a88985..402ad95658 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -256,7 +256,12 @@ void dartfmt() async {
 }
 
 @Task('Run quick presubmit checks.')
-@Depends(analyze, checkBuild, smokeTest, dartfmt, tryPublish)
+@Depends(
+  analyze,
+  checkBuild,
+  smokeTest,
+  dartfmt, /*tryPublish*/
+)
 void presubmit() => null;
 
 @Task('Run long tests, self-test dartdoc, and run the publish test')