diff --git a/.travis.yml b/.travis.yml
index c7ca622..4e638d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@
   - stable
   - "dev/raw/latest"
 env:
+  - DARTDOC_BOT=flutter
   - DARTDOC_BOT=sdk-analyzer
   - DARTDOC_BOT=main
-  - DARTDOC_BOT=flutter
   - DARTDOC_BOT=packages
   - DARTDOC_BOT=sdk-docs
 script: ./tool/travis.sh
diff --git a/test/compare_output_test.dart b/test/compare_output_test.dart
index 905b2e4..301a95b 100644
--- a/test/compare_output_test.dart
+++ b/test/compare_output_test.dart
@@ -67,9 +67,7 @@
               'Top level package requires Flutter but FLUTTER_ROOT environment variable not set|test_package_flutter_plugin requires the Flutter SDK, version solving failed')));
       expect(result.stderr, isNot(contains('asynchronous gap')));
       expect(result.exitCode, isNot(0));
-    },
-        skip:
-            true /* TODO(gspencer): Re-enable as soon as Flutter's config is sane again. */);
+    });
 
     test("Validate --version works", () async {
       var args = <String>[dartdocBin, '--version'];
diff --git a/testing/test_package_flutter_plugin/.gitignore b/testing/test_package_flutter_plugin/.gitignore
new file mode 100644
index 0000000..cb172e9
--- /dev/null
+++ b/testing/test_package_flutter_plugin/.gitignore
@@ -0,0 +1 @@
+android/**
diff --git a/tool/grind.dart b/tool/grind.dart
index 42eef12..614bc94 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -592,8 +592,7 @@
 }
 
 @Task('Validate flutter docs')
-// TODO(jcollins-g): add buildDartdocFlutterPluginDocs once passing
-@Depends(buildFlutterDocs)
+@Depends(buildFlutterDocs, buildDartdocFlutterPluginDocs)
 void validateFlutterDocs() {}
 
 @Task('Build flutter docs')
@@ -641,6 +640,11 @@
       ['precache'],
       workingDirectory: flutterPath,
     );
+    await launcher.runStreamed(
+      bin,
+      ['update-packages'],
+      workingDirectory: flutterPath,
+    );
   }
 
   factory FlutterRepo.fromPath(String flutterPath, Map<String, String> env,
@@ -924,6 +928,8 @@
           [
             '--enable-asserts',
             pathLib.join(Directory.current.path, 'bin', 'dartdoc.dart'),
+            '--exclude-packages',
+            'Dart', // TODO(jcollins-g): dart-lang/dartdoc#1431
             '--json',
             '--link-to-remote',
             '--output',