diff --git a/test/build/copies_browser_js_next_to_entrypoints_test.dart b/test/build/copies_browser_js_next_to_entrypoints_test.dart
index 51780218c59773f9ac40032518837465f8d774d1..99e4e64d4128cb6d8485a3cc1ea795e5d47b7182 100644
--- a/test/build/copies_browser_js_next_to_entrypoints_test.dart
+++ b/test/build/copies_browser_js_next_to_entrypoints_test.dart
@@ -37,7 +37,7 @@ main() {
     pubGet();
 
     schedulePub(args: ["build", "foo", "web"],
-        output: new RegExp(r'Built 16 files to "build".'));
+        output: new RegExp(r'Built 12 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [
diff --git a/test/build/copies_browser_js_with_dependency_override_test.dart b/test/build/copies_browser_js_with_dependency_override_test.dart
index 59d0aced1c8e003218651c001c17a2526b31c0cb..893eec35876a07f75ee73ad738a476dd83a5790d 100644
--- a/test/build/copies_browser_js_with_dependency_override_test.dart
+++ b/test/build/copies_browser_js_with_dependency_override_test.dart
@@ -36,7 +36,7 @@ main() {
     pubGet();
 
     schedulePub(args: ["build", "--all"],
-        output: new RegExp(r'Built 4 files to "build".'));
+        output: new RegExp(r'Built 3 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [
diff --git a/test/build/copies_browser_js_with_dev_dependency_test.dart b/test/build/copies_browser_js_with_dev_dependency_test.dart
index 831de86385d93fc8f356c9a3a786c84bf0062e29..a174e3e702ffade7010bc6446a6bb9d96d64b069 100644
--- a/test/build/copies_browser_js_with_dev_dependency_test.dart
+++ b/test/build/copies_browser_js_with_dev_dependency_test.dart
@@ -36,7 +36,7 @@ main() {
     pubGet();
 
     schedulePub(args: ["build", "--all"],
-        output: new RegExp(r'Built 4 files to "build".'));
+        output: new RegExp(r'Built 3 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [
diff --git a/test/build/outputs_results_to_json_test.dart b/test/build/outputs_results_to_json_test.dart
index 0099f0d95b7899c753731de0158c38ca11894243..3fb7c1c7c37557f88fc194904518ae36dde93881 100644
--- a/test/build/outputs_results_to_json_test.dart
+++ b/test/build/outputs_results_to_json_test.dart
@@ -26,7 +26,7 @@ main() {
         outputJson: {
           'buildResult': 'success',
           'outputDirectory': 'build',
-          'numFiles': 2,
+          'numFiles': 1,
           'log': [
             {
               'level': 'Info',
diff --git a/test/dart2js/compiles_entrypoints_in_root_package_test.dart b/test/dart2js/compiles_entrypoints_in_root_package_test.dart
index c2ab7b4692757ee9018453f7fc33e0bdcffed6e5..f8207e62771fd1251b5a67208d19296d2b9da489 100644
--- a/test/dart2js/compiles_entrypoints_in_root_package_test.dart
+++ b/test/dart2js/compiles_entrypoints_in_root_package_test.dart
@@ -40,7 +40,7 @@ main() {
     ]).create();
 
     schedulePub(args: ["build", "benchmark", "foo", "web"],
-        output: new RegExp(r'Built 12 files to "build".'));
+        output: new RegExp(r'Built 6 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [
diff --git a/test/dart2js/omits_source_map_in_release_test.dart b/test/dart2js/omits_source_map_in_release_test.dart
index d4dbeafa079f957904aaea0c6364221310617421..f26611e3aec4a9d39f53869eaac26b577fccb844 100644
--- a/test/dart2js/omits_source_map_in_release_test.dart
+++ b/test/dart2js/omits_source_map_in_release_test.dart
@@ -16,7 +16,7 @@ main() {
     ]).create();
 
     schedulePub(args: ["build"],
-        output: new RegExp(r'Built 2 files to "build".'),
+        output: new RegExp(r'Built 1 file to "build".'),
         exitCode: 0);
 
     d.dir(appPath, [
diff --git a/test/dart2js/outputs_deferred_libraries_test.dart b/test/dart2js/outputs_deferred_libraries_test.dart
index 6680f12f14d7866b678fd878e8aebcf3e0a587a5..7a0f4ae69f6e985dcdad49848020f243069f6f8f 100644
--- a/test/dart2js/outputs_deferred_libraries_test.dart
+++ b/test/dart2js/outputs_deferred_libraries_test.dart
@@ -50,7 +50,7 @@ main() {
     ]).create();
 
     schedulePub(args: ["build"],
-        output: new RegExp(r'Built 4 files to "build".'));
+        output: new RegExp(r'Built 3 files to "build".'));
 
     d.dir(appPath, [
       d.dir('build', [
diff --git a/test/dart2js/supports_configuration_with_build_test.dart b/test/dart2js/supports_configuration_with_build_test.dart
index e4d56c87131fe134318151adb2e6f139bb5b7ddc..96501928bbaed4f09acc5d064acaf0a23d1bfd0b 100644
--- a/test/dart2js/supports_configuration_with_build_test.dart
+++ b/test/dart2js/supports_configuration_with_build_test.dart
@@ -68,7 +68,7 @@ main() {
     pubGet();
 
     schedulePub(args: ["build"],
-        output: new RegExp(r'Built 4 files to "build".'),
+        output: new RegExp(r'Built 3 files to "build".'),
         exitCode: 0);
 
     d.dir(appPath, [