diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index 6bcb75dd7f..b9c4d506d9 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -189,14 +189,27 @@ Future<Null> _analyzeRepo() async {
 
   await _checkForTrailingSpaces();
 
-  // Try an analysis against a big version of the gallery.
-  await _runCommand(dart,
-    <String>['--preview-dart-2', path.join(flutterRoot, 'dev', 'tools', 'mega_gallery.dart')],
-    workingDirectory: flutterRoot,
-  );
-  await _runFlutterAnalyze(path.join(flutterRoot, 'dev', 'benchmarks', 'mega_gallery'),
-    options: <String>['--watch', '--benchmark'],
-  );
+  // Try analysis against a big version of the gallery; generate into a temporary directory.
+  final String outDir = Directory.systemTemp.createTempSync('mega_gallery').path;
+
+  try {
+    await _runCommand(dart,
+      <String>[
+        '--preview-dart-2',
+        path.join(flutterRoot, 'dev', 'tools', 'mega_gallery.dart'),
+        '--out',
+        outDir,
+      ],
+      workingDirectory: flutterRoot,
+    );
+    await _runFlutterAnalyze(outDir, options: <String>['--watch', '--benchmark']);
+  } finally {
+    try {
+      new Directory(outDir).deleteSync(recursive: true);
+    } catch (e) {
+      // ignore
+    }
+  }
 
   print('${bold}DONE: Analysis successful.$reset');
 }
diff --git a/dev/tools/mega_gallery.dart b/dev/tools/mega_gallery.dart
index 34bb04bf97..650580e0ec 100644
--- a/dev/tools/mega_gallery.dart
+++ b/dev/tools/mega_gallery.dart
@@ -18,8 +18,7 @@ void main(List<String> args) {
     Directory.current = Directory.current.parent.parent;
 
   final ArgParser argParser = new ArgParser();
-  // ../mega_gallery? dev/benchmarks/mega_gallery?
-  argParser.addOption('out', defaultsTo: _normalize('dev/benchmarks/mega_gallery'));
+  argParser.addOption('out');
   argParser.addOption('copies');
   argParser.addFlag('delete', negatable: false);
   argParser.addFlag('help', abbr: 'h', negatable: false);
@@ -45,6 +44,12 @@ void main(List<String> args) {
     exit(0);
   }
 
+  if (!results.wasParsed('out')) {
+    print('The --out parameter is required.');
+    print(argParser.usage);
+    exit(1);
+  }
+
   int copies;
   if (!results.wasParsed('copies')) {
     final SourceStats stats = getStatsFor(_dir(source, 'lib'));
@@ -128,7 +133,7 @@ void _copyGallery(Directory galleryDir, int index) {
 
 void _copy(Directory source, Directory target) {
   if (!target.existsSync())
-    target.createSync();
+    target.createSync(recursive: true);
 
   for (FileSystemEntity entity in source.listSync(followLinks: false)) {
     final String name = path.basename(entity.path);