diff --git a/sdk/lib/_internal/pub_generated/pub.status b/sdk/lib/_internal/pub_generated/pub.status
deleted file mode 100644
index ac7f648b492..00000000000
--- a/sdk/lib/_internal/pub_generated/pub.status
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-test/dart2js/compiles_generated_file_from_dependency_test: Pass, Slow
-test/serve/web_socket/url_to_asset_id_test: Pass, Slow
-test/transformer/loads_a_diamond_transformer_dependency_graph_test: Pass, Slow
-
-# Pub only runs on the VM, so just rule out all compilers.
-[ $compiler == dart2js || $compiler == dart2dart ]
-*: Skip
-
-# Pub only runs on the standalone VM, not the browser.
-[ $runtime == drt || $runtime == dartium || $runtime == opera ]
-*: Skip
-
-[ $runtime == vm && $system == windows ]
-test/run/app_can_read_from_stdin_test: Fail # Issue 19448
-test/real_version_test: RuntimeError # Issue 20882
diff --git a/tools/test.dart b/tools/test.dart
index f85717ae7d8..ac25d115a79 100755
--- a/tools/test.dart
+++ b/tools/test.dart
@@ -221,8 +221,11 @@ void testConfigurations(List<Map> configurations) {
         } else if (key == 'pub') {
           // TODO(rnystrom): Move pub back into TEST_SUITE_DIRECTORIES once
           // #104 is fixed.
-          testSuites.add(new StandardTestSuite.forDirectory(conf,
-              new Path('sdk/lib/_internal/pub_generated'), 'pub'));
+          testSuites.add(new StandardTestSuite(conf, 'pub',
+              new Path('sdk/lib/_internal/pub_generated'),
+              ['sdk/lib/_internal/pub/pub.status'],
+              isTestFilePredicate: (file) => file.endsWith('_test.dart'),
+              recursive: true));
         }
       }
 
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index d4100d5e406..a17fbf77363 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -636,10 +636,8 @@ class StandardTestSuite extends TestSuite {
    * particular, if you add 'path/to/mytestsuite' to [TEST_SUITE_DIRECTORIES]
    * in test.dart, this will all be set up for you.
    */
-  factory StandardTestSuite.forDirectory(Map configuration, Path directory,
-      [String name]) {
-    if (name == null) name = directory.filename;
-
+  factory StandardTestSuite.forDirectory(Map configuration, Path directory) {
+    var name = directory.filename;
     var status_paths = ['$directory/$name.status',
                         '$directory/.status',
                         '$directory/${name}_dart2js.status',