diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
index 93254c793c4c6f..7e3d82b5628dbf 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
@@ -404,7 +404,23 @@ message Configuration {
 // The main information is in the chaining part: the id will contain the
 // target pattern that was expanded and the children id will contain the
 // target or target pattern it was expanded to.
-message PatternExpanded {}
+message PatternExpanded {
+  // Represents a test_suite target and the tests that it expanded to. Nested
+  // test suites are recursively expanded. The test labels only contain the
+  // final test targets, not any nested suites.
+  message TestSuiteExpansion {
+    // The label of the test_suite rule.
+    string suite_label = 1;
+    // Labels of the test targets included in the suite. Includes all tests in
+    // the suite regardless of any filters or negative patterns which may result
+    // in the test not actually being run.
+    repeated string test_labels = 2;
+  }
+
+  // All test suites requested via top-level target patterns. Does not include
+  // test suites whose label matched a negative pattern.
+  repeated TestSuiteExpansion test_suite_expansions = 1;
+}
 
 // Enumeration type characterizing the size of a test, as specified by the
 // test rule.
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
index bc1bc9f91f599c..9d2a7ccebdd9fa 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
@@ -13,9 +13,10 @@
 // limitations under the License.
 package com.google.devtools.build.lib.pkgcache;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Iterables;
@@ -23,6 +24,7 @@
 import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.PatternExpanded;
 import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint;
 import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -79,12 +81,8 @@ public boolean isNotATestOrTestSuite() {
   private final ImmutableSet<ThinTarget> testFilteredTargets;
   private final ImmutableSet<ThinTarget> expandedTargets;
   private final ImmutableSetMultimap<String, Label> originalPatternsToLabels;
+  private final ImmutableMap<Label, ImmutableSet<Label>> testSuiteExpansions;
 
-  /**
-   * Construct the event.
-   *
-   * @param targets The targets that were parsed from the command-line pattern.
-   */
   public TargetParsingCompleteEvent(
       Collection<Target> targets,
       Collection<Target> filteredTargets,
@@ -92,26 +90,16 @@ public TargetParsingCompleteEvent(
       ImmutableList<String> originalTargetPattern,
       Collection<Target> expandedTargets,
       ImmutableList<String> failedTargetPatterns,
-      ImmutableSetMultimap<String, Label> originalPatternsToLabels) {
+      ImmutableSetMultimap<String, Label> originalPatternsToLabels,
+      ImmutableMap<Label, ImmutableSet<Label>> testSuiteExpansions) {
     this.targets = asThinTargets(targets);
     this.filteredTargets = asThinTargets(filteredTargets);
     this.testFilteredTargets = asThinTargets(testFilteredTargets);
     this.originalTargetPattern = Preconditions.checkNotNull(originalTargetPattern);
     this.expandedTargets = asThinTargets(expandedTargets);
     this.failedTargetPatterns = Preconditions.checkNotNull(failedTargetPatterns);
-    this.originalPatternsToLabels = originalPatternsToLabels;
-  }
-
-  @VisibleForTesting
-  public TargetParsingCompleteEvent(Collection<Target> targets) {
-    this(
-        targets,
-        ImmutableSet.of(),
-        ImmutableSet.of(),
-        ImmutableList.of(),
-        targets,
-        ImmutableList.of(),
-        ImmutableSetMultimap.of());
+    this.originalPatternsToLabels = Preconditions.checkNotNull(originalPatternsToLabels);
+    this.testSuiteExpansions = Preconditions.checkNotNull(testSuiteExpansions);
   }
 
   public ImmutableList<String> getOriginalTargetPattern() {
@@ -181,7 +169,7 @@ public Collection<BuildEventId> getChildrenEvents() {
           BuildEventIdUtil.targetPatternExpanded(ImmutableList.of(failedTargetPattern)));
     }
     for (ThinTarget target : expandedTargets) {
-      // Test suits won't produce target configuration and  target-complete events, so do not
+      // Test suites won't produce target configuration and target-complete events, so do not
       // announce here completion as children.
       if (!target.isTestSuiteRule()) {
         childrenBuilder.add(BuildEventIdUtil.targetConfigured(target.getLabel()));
@@ -192,9 +180,15 @@ public Collection<BuildEventId> getChildrenEvents() {
 
   @Override
   public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) {
-    return GenericBuildEvent.protoChaining(this)
-        .setExpanded(BuildEventStreamProtos.PatternExpanded.newBuilder().build())
-        .build();
+    PatternExpanded.Builder expanded = PatternExpanded.newBuilder();
+    testSuiteExpansions.forEach(
+        (suite, tests) ->
+            expanded
+                .addTestSuiteExpansionsBuilder()
+                .setSuiteLabel(suite.toString())
+                .addAllTestLabels(Collections2.transform(tests, Label::toString)));
+
+    return GenericBuildEvent.protoChaining(this).setExpanded(expanded).build();
   }
 
   private static ImmutableSet<ThinTarget> asThinTargets(Collection<Target> targets) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
index 6a373dd0f7e219..6cd4c7846fab9d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
@@ -188,15 +188,18 @@ public TargetPatternPhaseValue compute(SkyKey key, Environment env) throws Inter
     maybeReportDeprecation(env.getListener(), targets.getTargets());
 
     ResolvedTargets.Builder<Label> expandedLabelsBuilder = ResolvedTargets.builder();
+    ImmutableMap.Builder<Label, ImmutableSet<Label>> testSuiteExpansions =
+        ImmutableMap.builderWithExpectedSize(expandedTests.size());
     for (Target target : targets.getTargets()) {
+      Label label = target.getLabel();
       if (TargetUtils.isTestSuiteRule(target) && options.isExpandTestSuites()) {
-        SkyKey expansionKey =
-            Preconditions.checkNotNull(testExpansionKeys.get(target.getLabel()));
-        TestsForTargetPatternValue testExpansion =
-            (TestsForTargetPatternValue) expandedTests.get(expansionKey);
-        expandedLabelsBuilder.merge(testExpansion.getLabels());
+        SkyKey expansionKey = Preconditions.checkNotNull(testExpansionKeys.get(label));
+        ResolvedTargets<Label> testExpansion =
+            ((TestsForTargetPatternValue) expandedTests.get(expansionKey)).getLabels();
+        expandedLabelsBuilder.merge(testExpansion);
+        testSuiteExpansions.put(label, testExpansion.getTargets());
       } else {
-        expandedLabelsBuilder.add(target.getLabel());
+        expandedLabelsBuilder.add(label);
       }
     }
     ResolvedTargets<Label> targetLabels = expandedLabelsBuilder.build();
@@ -231,7 +234,8 @@ public TargetPatternPhaseValue compute(SkyKey key, Environment env) throws Inter
                 options.getTargetPatterns(),
                 expandedTargets.getTargets(),
                 ImmutableList.copyOf(failedPatterns),
-                mapOriginalPatternsToLabels(expandedPatterns, targets.getTargets())));
+                mapOriginalPatternsToLabels(expandedPatterns, targets.getTargets()),
+                testSuiteExpansions.build()));
     env.getListener()
         .post(new LoadingPhaseCompleteEvent(result.getTargetLabels(), removedTargetLabels));
     return result;
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index ee2490c2d7e53c..3a7a78ea35bbb0 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -265,6 +265,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/analysis:config/build_options",
         "//src/main/java/com/google/devtools/build/lib/analysis:server_directories",
         "//src/main/java/com/google/devtools/build/lib/bazel/rules",
+        "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
         "//src/main/java/com/google/devtools/build/lib/clock",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/events",
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index 23ef7ce244061c..28e2adf24981e6 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -14,12 +14,12 @@
 package com.google.devtools.build.lib.pkgcache;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.base.Functions;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -27,7 +27,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Maps;
-import com.google.common.collect.MoreCollectors;
 import com.google.devtools.build.lib.actions.ActionKeyContext;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.BuildView;
@@ -35,6 +34,7 @@
 import com.google.devtools.build.lib.analysis.ServerDirectories;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.util.AnalysisMock;
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.PatternExpanded.TestSuiteExpansion;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.TargetParsingException;
@@ -81,30 +81,28 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** Tests for {@link SkyframeExecutor#loadTargetPatternsWithFilters}. */
 @RunWith(JUnit4.class)
-public class LoadingPhaseRunnerTest {
-
-  private static final ImmutableList<Logger> loggers = ImmutableList.of(
-      Logger.getLogger(BuildView.class.getName()));
-  static {
-    for (Logger logger : loggers) {
-      logger.setLevel(Level.OFF);
-    }
-  }
+public final class LoadingPhaseRunnerTest {
 
   private LoadingPhaseTester tester;
 
+  @BeforeClass
+  public static void silenceLogger() {
+    Logger.getLogger(BuildView.class.getName()).setLevel(Level.OFF);
+  }
+
   @Before
-  public final void createLoadingPhaseTester() throws Exception  {
+  public final void createLoadingPhaseTester() throws Exception {
     tester = new LoadingPhaseTester();
   }
 
-  private List<Label> getLabels(String... labels) throws Exception {
+  private static List<Label> getLabels(String... labels) {
     List<Label> result = new ArrayList<>();
     for (String label : labels) {
       result.add(Label.parseAbsoluteUnchecked(label));
@@ -128,8 +126,7 @@ private TargetPatternPhaseValue assertNoErrors(TargetPatternPhaseValue loadingRe
 
   @Test
   public void testSmoke() throws Exception {
-    tester.addFile("base/BUILD",
-        "filegroup(name = 'hello', srcs = ['foo.txt'])");
+    tester.addFile("base/BUILD", "filegroup(name = 'hello', srcs = ['foo.txt'])");
     TargetPatternPhaseValue loadingResult = assertNoErrors(tester.load("//base:hello"));
     assertThat(loadingResult.getTargetLabels())
         .containsExactlyElementsIn(getLabels("//base:hello"));
@@ -150,7 +147,7 @@ public void testNonExistentPackage() throws Exception {
   }
 
   @Test
-  public void testNonExistentPackageWithoutKeepGoing() throws Exception {
+  public void testNonExistentPackageWithoutKeepGoing() {
     assertThrows(TargetParsingException.class, () -> tester.load("//does/not/exist"));
     PatternExpandingError err = tester.findPostOnce(PatternExpandingError.class);
     assertThat(err.getPattern()).containsExactly("//does/not/exist");
@@ -172,8 +169,7 @@ public void testNonExistentTarget() throws Exception {
 
   @Test
   public void testExistingAndNonExistentTargetsWithKeepGoing() throws Exception {
-    tester.addFile("base/BUILD",
-        "filegroup(name = 'hello', srcs = ['foo.txt'])");
+    tester.addFile("base/BUILD", "filegroup(name = 'hello', srcs = ['foo.txt'])");
     tester.loadKeepGoing("//base:hello", "//base:missing");
     PatternExpandingError err = tester.findPostOnce(PatternExpandingError.class);
     assertThat(err.getPattern()).containsExactly("//base:missing");
@@ -184,29 +180,22 @@ public void testExistingAndNonExistentTargetsWithKeepGoing() throws Exception {
 
   @Test
   public void testRecursiveAllRules() throws Exception {
-    tester.addFile("base/BUILD",
-        "filegroup(name = 'base', srcs = ['base.txt'])");
-    tester.addFile("base/foo/BUILD",
-        "filegroup(name = 'foo', srcs = ['foo.txt'])");
-    tester.addFile("base/bar/BUILD",
-        "filegroup(name = 'bar', srcs = ['bar.txt'])");
+    tester.addFile("base/BUILD", "filegroup(name = 'base', srcs = ['base.txt'])");
+    tester.addFile("base/foo/BUILD", "filegroup(name = 'foo', srcs = ['foo.txt'])");
+    tester.addFile("base/bar/BUILD", "filegroup(name = 'bar', srcs = ['bar.txt'])");
     TargetPatternPhaseValue loadingResult = tester.load("//base/...");
     assertThat(loadingResult.getTargetLabels())
         .containsExactlyElementsIn(getLabels("//base", "//base/foo", "//base/bar"));
 
     loadingResult = tester.load("//base/bar/...");
-    assertThat(loadingResult.getTargetLabels())
-        .containsExactlyElementsIn(getLabels("//base/bar"));
+    assertThat(loadingResult.getTargetLabels()).containsExactlyElementsIn(getLabels("//base/bar"));
   }
 
   @Test
   public void testRecursiveAllTargets() throws Exception {
-    tester.addFile("base/BUILD",
-        "filegroup(name = 'base', srcs = ['base.txt'])");
-    tester.addFile("base/foo/BUILD",
-        "filegroup(name = 'foo', srcs = ['foo.txt'])");
-    tester.addFile("base/bar/BUILD",
-        "filegroup(name = 'bar', srcs = ['bar.txt'])");
+    tester.addFile("base/BUILD", "filegroup(name = 'base', srcs = ['base.txt'])");
+    tester.addFile("base/foo/BUILD", "filegroup(name = 'foo', srcs = ['foo.txt'])");
+    tester.addFile("base/bar/BUILD", "filegroup(name = 'bar', srcs = ['bar.txt'])");
     TargetPatternPhaseValue loadingResult = tester.load("//base/...:*");
     assertThat(loadingResult.getTargetLabels())
         .containsExactlyElementsIn(
@@ -250,21 +239,20 @@ public void testNonExistentRecursive() throws Exception {
   }
 
   @Test
-  public void testMistypedTarget() throws Exception {
+  public void testMistypedTarget() {
     TargetParsingException e =
         assertThrows(TargetParsingException.class, () -> tester.load("foo//bar:missing"));
     assertThat(e)
         .hasMessageThat()
         .contains(
-            "invalid target format 'foo//bar:missing': "
-                + "invalid package name 'foo//bar': "
-                + "package names may not contain '//' path separators");
+            "invalid target format 'foo//bar:missing': invalid package name 'foo//bar': package"
+                + " names may not contain '//' path separators");
     ParsingFailedEvent err = tester.findPostOnce(ParsingFailedEvent.class);
     assertThat(err.getPattern()).isEqualTo("foo//bar:missing");
   }
 
   @Test
-  public void testEmptyTarget() throws Exception {
+  public void testEmptyTarget() {
     TargetParsingException e = assertThrows(TargetParsingException.class, () -> tester.load(""));
     assertThat(e).hasMessageThat().contains("the empty string is not a valid target");
   }
@@ -274,9 +262,8 @@ public void testMistypedTargetKeepGoing() throws Exception {
     TargetPatternPhaseValue result = tester.loadKeepGoing("foo//bar:missing");
     assertThat(result.hasError()).isTrue();
     tester.assertContainsError(
-          "invalid target format 'foo//bar:missing': "
-          + "invalid package name 'foo//bar': "
-          + "package names may not contain '//' path separators");
+        "invalid target format 'foo//bar:missing': invalid package name 'foo//bar': package names"
+            + " may not contain '//' path separators");
     ParsingFailedEvent err = tester.findPostOnce(ParsingFailedEvent.class);
     assertThat(err.getPattern()).isEqualTo("foo//bar:missing");
   }
@@ -308,7 +295,8 @@ public void testManualTarget() throws Exception {
   @Test
   public void testConfigSettingTarget() throws Exception {
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
-    tester.addFile("config/BUILD",
+    tester.addFile(
+        "config/BUILD",
         "cc_library(name = 'somelib', srcs = [ 'somelib.cc' ], hdrs = [ 'somelib.h' ])",
         "config_setting(name = 'configa', values = { 'define': 'foo=a' })",
         "config_setting(name = 'configb', values = { 'define': 'foo=b' })");
@@ -322,8 +310,7 @@ public void testConfigSettingTarget() throws Exception {
 
   @Test
   public void testNegativeTestDoesNotShowUpAtAll() throws Exception {
-    tester.addFile("my_test/BUILD",
-        "sh_test(name = 'my_test', srcs = ['test.cc'])");
+    tester.addFile("my_test/BUILD", "sh_test(name = 'my_test', srcs = ['test.cc'])");
     assertNoErrors(tester.loadTests("-//my_test"));
     assertThat(tester.getFilteredTargets()).isEmpty();
     assertThat(tester.getTestFilteredTargets()).isEmpty();
@@ -331,8 +318,7 @@ public void testNegativeTestDoesNotShowUpAtAll() throws Exception {
 
   @Test
   public void testNegativeTargetDoesNotShowUpAtAll() throws Exception {
-    tester.addFile("my_library/BUILD",
-        "cc_library(name = 'my_library', srcs = ['test.cc'])");
+    tester.addFile("my_library/BUILD", "cc_library(name = 'my_library', srcs = ['test.cc'])");
     assertNoErrors(tester.loadTests("-//my_library"));
     assertThat(tester.getFilteredTargets()).isEmpty();
     assertThat(tester.getTestFilteredTargets()).isEmpty();
@@ -389,7 +375,8 @@ public void testDeletedPackage() throws Exception {
   }
 
   private void writeBuildFilesForTestFiltering() throws Exception {
-    tester.addFile("tests/BUILD",
+    tester.addFile(
+        "tests/BUILD",
         "sh_test(name = 't1', srcs = ['pass.sh'], size= 'small', local=1)",
         "sh_test(name = 't2', srcs = ['pass.sh'], size = 'medium')",
         "sh_test(name = 't3', srcs = ['pass.sh'], tags = ['manual', 'local'])");
@@ -472,7 +459,8 @@ public void testTestFilteringLocalAndBuildTestsOnly() throws Exception {
   @Test
   public void testTestSuiteExpansion() throws Exception {
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
-    tester.addFile("cc/BUILD",
+    tester.addFile(
+        "cc/BUILD",
         "cc_test(name = 'my_test', srcs = ['test.cc'])",
         "test_suite(name = 'tests', tests = [':my_test'])");
     TargetPatternPhaseValue loadingResult = assertNoErrors(tester.loadTests("//cc:tests"));
@@ -488,8 +476,7 @@ public void testTestSuiteExpansion() throws Exception {
 
   @Test
   public void testTestSuiteExpansionFails() throws Exception {
-    tester.addFile("ts/BUILD",
-        "test_suite(name = 'tests', tests = ['//nonexistent:my_test'])");
+    tester.addFile("ts/BUILD", "test_suite(name = 'tests', tests = ['//nonexistent:my_test'])");
     tester.useLoadingOptions("--build_tests_only");
     TargetPatternPhaseValue loadingResult = tester.loadTestsKeepGoing("//ts:tests");
     assertThat(loadingResult.hasError()).isTrue();
@@ -499,8 +486,7 @@ public void testTestSuiteExpansionFails() throws Exception {
 
   @Test
   public void testTestSuiteExpansionFailsForBuild() throws Exception {
-    tester.addFile("ts/BUILD",
-        "test_suite(name = 'tests', tests = [':nonexistent_test'])");
+    tester.addFile("ts/BUILD", "test_suite(name = 'tests', tests = [':nonexistent_test'])");
     TargetPatternPhaseValue loadingResult = tester.loadKeepGoing("//ts:tests");
     assertThat(loadingResult.hasError()).isFalse();
     assertThat(loadingResult.hasPostExpansionError()).isTrue();
@@ -533,8 +519,7 @@ public void failureWhileLoadingTestsForTestSuiteNoKeepGoing() throws Exception {
   @Test
   public void testTestSuiteExpansionFailsMissingTarget() throws Exception {
     tester.addFile("other/BUILD", "");
-    tester.addFile("ts/BUILD",
-        "test_suite(name = 'tests', tests = ['//other:no_such_test'])");
+    tester.addFile("ts/BUILD", "test_suite(name = 'tests', tests = ['//other:no_such_test'])");
     TargetPatternPhaseValue result = tester.loadTestsKeepGoing("//ts:tests");
     assertThat(result.hasError()).isTrue();
     assertThat(result.hasPostExpansionError()).isTrue();
@@ -544,7 +529,8 @@ public void testTestSuiteExpansionFailsMissingTarget() throws Exception {
   @Test
   public void testTestSuiteExpansionFailsMultipleSuites() throws Exception {
     tester.addFile("other/BUILD", "");
-    tester.addFile("ts/BUILD",
+    tester.addFile(
+        "ts/BUILD",
         "test_suite(name = 'a', tests = ['//other:no_such_test'])",
         "test_suite(name = 'b', tests = [])");
     TargetPatternPhaseValue result = tester.loadTestsKeepGoing("//ts:all");
@@ -555,7 +541,8 @@ public void testTestSuiteExpansionFailsMultipleSuites() throws Exception {
 
   @Test
   public void testTestSuiteOverridesManualWithBuildTestsOnly() throws Exception {
-    tester.addFile("foo/BUILD",
+    tester.addFile(
+        "foo/BUILD",
         "sh_test(name = 'foo', srcs = ['foo.sh'], tags = ['manual'])",
         "sh_test(name = 'bar', srcs = ['bar.sh'], tags = ['manual'])",
         "sh_test(name = 'baz', srcs = ['baz.sh'])",
@@ -575,7 +562,8 @@ public void testTestSuiteOverridesManualWithBuildTestsOnly() throws Exception {
   @Test
   public void testFilterNegativeTestFromTestSuite() throws Exception {
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
-    tester.addFile("cc/BUILD",
+    tester.addFile(
+        "cc/BUILD",
         "cc_test(name = 'my_test', srcs = ['test.cc'])",
         "cc_test(name = 'my_other_test', srcs = ['other_test.cc'])",
         "test_suite(name = 'tests', tests = [':my_test', ':my_other_test'])");
@@ -591,15 +579,15 @@ public void testFilterNegativeTestFromTestSuite() throws Exception {
   @Test
   public void testNegativeTestSuiteExpanded() throws Exception {
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
-    tester.addFile("cc/BUILD",
+    tester.addFile(
+        "cc/BUILD",
         "cc_test(name = 'my_test', srcs = ['test.cc'])",
         "cc_test(name = 'my_other_test', srcs = ['other_test.cc'])",
         "test_suite(name = 'tests', tests = [':my_test'])",
         "test_suite(name = 'all_tests', tests = ['my_other_test'])");
     TargetPatternPhaseValue result =
         assertNoErrors(tester.loadTests("//cc:all_tests", "-//cc:tests"));
-    assertThat(result.getTargetLabels())
-        .containsExactlyElementsIn(getLabels("//cc:my_other_test"));
+    assertThat(result.getTargetLabels()).containsExactlyElementsIn(getLabels("//cc:my_other_test"));
     assertThat(result.getTestsToRunLabels())
         .containsExactlyElementsIn(getLabels("//cc:my_other_test"));
   }
@@ -609,12 +597,12 @@ public void testTestSuiteIsSubtracted() throws Exception {
     // Test suites are expanded for each target pattern in sequence, not the whole set of target
     // patterns after all the inclusions and exclusions are processed.
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
-    tester.addFile("cc/BUILD",
+    tester.addFile(
+        "cc/BUILD",
         "cc_test(name = 'my_test', srcs = ['test.cc'])",
         "cc_test(name = 'my_other_test', srcs = ['other_test.cc'])",
         "test_suite(name = 'tests', tests = [':my_test'])");
-    TargetPatternPhaseValue result =
-        assertNoErrors(tester.loadTests("//cc:all", "-//cc:tests"));
+    TargetPatternPhaseValue result = assertNoErrors(tester.loadTests("//cc:all", "-//cc:tests"));
     assertThat(result.getTargetLabels())
         .containsExactlyElementsIn(getLabels("//cc:my_test", "//cc:my_other_test"));
     assertThat(result.getTestsToRunLabels())
@@ -626,17 +614,16 @@ public void testTestSuiteIsSubtracted() throws Exception {
   public void testNoTestsInRecursivePattern() throws Exception {
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
     tester.addFile("foo/BUILD", "cc_library(name = 'foo', srcs = ['foo.cc'])");
-    TargetPatternPhaseValue result =
-        assertNoErrors(tester.loadTests("//foo/..."));
-    assertThat(result.getTargetLabels())
-        .containsExactlyElementsIn(getLabels("//foo"));
+    TargetPatternPhaseValue result = assertNoErrors(tester.loadTests("//foo/..."));
+    assertThat(result.getTargetLabels()).containsExactlyElementsIn(getLabels("//foo"));
     assertThat(result.getTestsToRunLabels()).isEmpty();
   }
 
   @Test
   public void testComplexTestSuite() throws Exception {
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
-    tester.addFile("cc/BUILD",
+    tester.addFile(
+        "cc/BUILD",
         "cc_test(name = 'test1', srcs = ['test.cc'])",
         "cc_test(name = 'test2', srcs = ['test.cc'])",
         "test_suite(name = 'empty', tags = ['impossible'], tests = [])",
@@ -651,14 +638,13 @@ public void testComplexTestSuite() throws Exception {
   @Test
   public void testAllExcludesManualTest() throws Exception {
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
-    tester.addFile("cc/BUILD",
+    tester.addFile(
+        "cc/BUILD",
         "cc_test(name = 'my_test', srcs = ['test.cc'])",
         "cc_test(name = 'my_other_test', srcs = ['other_test.cc'], tags = ['manual'])");
     TargetPatternPhaseValue result = assertNoErrors(tester.loadTests("//cc:all"));
-    assertThat(result.getTargetLabels())
-        .containsExactlyElementsIn(getLabels("//cc:my_test"));
-    assertThat(result.getTestsToRunLabels())
-        .containsExactlyElementsIn(getLabels("//cc:my_test"));
+    assertThat(result.getTargetLabels()).containsExactlyElementsIn(getLabels("//cc:my_test"));
+    assertThat(result.getTestsToRunLabels()).containsExactlyElementsIn(getLabels("//cc:my_test"));
   }
 
   @Test
@@ -681,7 +667,8 @@ public void testBuildFilterDoesNotApplyToTests() throws Exception {
   @Test
   public void testTotalNegationEmitsWarning() throws Exception {
     AnalysisMock.get().ccSupport().setup(tester.mockToolsConfig);
-    tester.addFile("cc/BUILD",
+    tester.addFile(
+        "cc/BUILD",
         "cc_test(name = 'my_test', srcs = ['test.cc'])",
         "test_suite(name = 'tests', tests = [':my_test'])");
     TargetPatternPhaseValue result = tester.loadTests("//cc:tests", "-//cc:my_test");
@@ -691,8 +678,7 @@ public void testTotalNegationEmitsWarning() throws Exception {
 
   @Test
   public void testRepeatedSameLoad() throws Exception {
-    tester.addFile("base/BUILD",
-        "filegroup(name = 'hello', srcs = ['foo.txt'])");
+    tester.addFile("base/BUILD", "filegroup(name = 'hello', srcs = ['foo.txt'])");
     TargetPatternPhaseValue firstResult = assertNoErrors(tester.load("//base:hello"));
     TargetPatternPhaseValue secondResult = assertNoErrors(tester.load("//base:hello"));
     assertThat(secondResult.getTargetLabels()).isEqualTo(firstResult.getTargetLabels());
@@ -702,8 +688,8 @@ public void testRepeatedSameLoad() throws Exception {
   /**
    * Tests whether globs can update correctly when a new file is added.
    *
-   * <p>The usage of {@link LoadingPhaseTester#sync()} triggers this via
-   * {@link SkyframeExecutor#invalidateFilesUnderPathForTesting}.
+   * <p>The usage of {@link LoadingPhaseTester#sync()} triggers this via {@link
+   * SkyframeExecutor#invalidateFilesUnderPathForTesting}.
    */
   @Test
   public void testGlobPicksUpNewFile() throws Exception {
@@ -713,7 +699,8 @@ public void testGlobPicksUpNewFile() throws Exception {
         Iterables.getOnlyElement(assertNoErrors(tester.load("//foo:x")).getTargetLabels());
     Target result = tester.getTarget(label.toString());
     assertThat(
-        Iterables.transform(result.getAssociatedRule().getLabels(), Functions.toStringFunction()))
+            Iterables.transform(
+                result.getAssociatedRule().getLabels(), Functions.toStringFunction()))
         .containsExactly("//foo:a.y");
 
     tester.addFile("foo/b.y");
@@ -721,7 +708,8 @@ public void testGlobPicksUpNewFile() throws Exception {
     label = Iterables.getOnlyElement(assertNoErrors(tester.load("//foo:x")).getTargetLabels());
     result = tester.getTarget(label.toString());
     assertThat(
-        Iterables.transform(result.getAssociatedRule().getLabels(), Functions.toStringFunction()))
+            Iterables.transform(
+                result.getAssociatedRule().getLabels(), Functions.toStringFunction()))
         .containsExactly("//foo:a.y", "//foo:b.y");
   }
 
@@ -745,7 +733,9 @@ public void testRecursivePatternWithCircularSymlink() throws Exception {
     tester.getWorkspace().getChild("broken").createDirectory();
 
     // Create a circular symlink.
-    tester.getWorkspace().getRelative(PathFragment.create("broken/BUILD"))
+    tester
+        .getWorkspace()
+        .getRelative(PathFragment.create("broken/BUILD"))
         .createSymbolicLink(PathFragment.create("BUILD"));
 
     assertCircularSymlinksDuringTargetParsing("//broken/...");
@@ -756,9 +746,13 @@ public void testRecursivePatternWithTwoCircularSymlinks() throws Exception {
     tester.getWorkspace().getChild("broken").createDirectory();
 
     // Create a circular symlink.
-    tester.getWorkspace().getRelative(PathFragment.create("broken/BUILD"))
+    tester
+        .getWorkspace()
+        .getRelative(PathFragment.create("broken/BUILD"))
         .createSymbolicLink(PathFragment.create("x"));
-    tester.getWorkspace().getRelative(PathFragment.create("broken/x"))
+    tester
+        .getWorkspace()
+        .getRelative(PathFragment.create("broken/x"))
         .createSymbolicLink(PathFragment.create("BUILD"));
 
     assertCircularSymlinksDuringTargetParsing("//broken/...");
@@ -766,7 +760,8 @@ public void testRecursivePatternWithTwoCircularSymlinks() throws Exception {
 
   @Test
   public void testSuiteInSuite() throws Exception {
-    tester.addFile("suite/BUILD",
+    tester.addFile(
+        "suite/BUILD",
         "test_suite(name = 'a', tests = [':b'])",
         "test_suite(name = 'b', tests = [':c'])",
         "sh_test(name = 'c', srcs = ['test.cc'])");
@@ -793,8 +788,7 @@ public void testTopLevelTargetErrorsPrintedExactlyOnce_keepGoing() throws Except
 
   @Test
   public void testCompileOneDependency() throws Exception {
-    tester.addFile("base/BUILD",
-        "cc_library(name = 'hello', srcs = ['hello.cc'])");
+    tester.addFile("base/BUILD", "cc_library(name = 'hello', srcs = ['hello.cc'])");
     tester.useLoadingOptions("--compile_one_dependency");
     TargetPatternPhaseValue result = assertNoErrors(tester.load("base/hello.cc"));
     assertThat(result.getTargetLabels()).containsExactlyElementsIn(getLabels("//base:hello"));
@@ -802,8 +796,7 @@ public void testCompileOneDependency() throws Exception {
 
   @Test
   public void testCompileOneDependencyNonExistentSource() throws Exception {
-    tester.addFile("base/BUILD",
-        "cc_library(name = 'hello', srcs = ['hello.cc', '//bad:bad.cc'])");
+    tester.addFile("base/BUILD", "cc_library(name = 'hello', srcs = ['hello.cc', '//bad:bad.cc'])");
     tester.useLoadingOptions("--compile_one_dependency");
     try {
       TargetPatternPhaseValue loadingResult = tester.load("base/hello.cc");
@@ -815,8 +808,7 @@ public void testCompileOneDependencyNonExistentSource() throws Exception {
 
   @Test
   public void testCompileOneDependencyNonExistentSourceKeepGoing() throws Exception {
-    tester.addFile("base/BUILD",
-        "cc_library(name = 'hello', srcs = ['hello.cc', '//bad:bad.cc'])");
+    tester.addFile("base/BUILD", "cc_library(name = 'hello', srcs = ['hello.cc', '//bad:bad.cc'])");
     tester.useLoadingOptions("--compile_one_dependency");
     TargetPatternPhaseValue loadingResult = tester.loadKeepGoing("base/hello.cc");
     assertThat(loadingResult.hasPostExpansionError()).isFalse();
@@ -824,8 +816,7 @@ public void testCompileOneDependencyNonExistentSourceKeepGoing() throws Exceptio
 
   @Test
   public void testCompileOneDependencyReferencesFile() throws Exception {
-    tester.addFile("base/BUILD",
-        "cc_library(name = 'hello', srcs = ['hello.cc', '//bad:bad.cc'])");
+    tester.addFile("base/BUILD", "cc_library(name = 'hello', srcs = ['hello.cc', '//bad:bad.cc'])");
     tester.useLoadingOptions("--compile_one_dependency");
     TargetParsingException e =
         assertThrows(TargetParsingException.class, () -> tester.load("//base:hello"));
@@ -886,6 +877,15 @@ public void mapsOriginalPatternsToLabels() throws Exception {
             "test/...", Label.parseAbsoluteUnchecked("//test/b:b_lib"));
   }
 
+  @Test
+  public void mapsOriginalPatternsToLabels_omitsExcludedTargets() throws Exception {
+    tester.addFile("test/a/BUILD", "cc_library(name = 'a_lib', srcs = ['a.cc'])");
+
+    tester.load("test/...", "-test/a:a_lib");
+
+    assertThat(tester.getOriginalPatternsToLabels()).isEmpty();
+  }
+
   @Test
   public void testSuiteCycle() throws Exception {
     tester.addFile(
@@ -901,18 +901,170 @@ public void testSuiteCycle() throws Exception {
   }
 
   @Test
-  public void mapsOriginalPatternsToLabels_omitsExcludedTargets() throws Exception {
-    tester.addFile("test/a/BUILD", "cc_library(name = 'a_lib', srcs = ['a.cc'])");
+  public void testSuiteExpansions_emptyIfNoTestSuitesRequested() throws Exception {
+    tester.addFile(
+        "foo/BUILD", "test_suite(name = 's', tests = ['a'])", "sh_test(name = 't', srcs = [])");
 
-    tester.load("test/...", "-test/a:a_lib");
+    tester.load("//foo:t");
 
-    assertThat(tester.getOriginalPatternsToLabels()).isEmpty();
+    assertThat(tester.getTestSuiteExpansions()).isEmpty();
+  }
+
+  @Test
+  public void testSuiteExpansions_includesEmptyTestSuite() throws Exception {
+    tester.addFile("foo/BUILD", "test_suite(name = 's', tests = [])");
+
+    tester.load("//foo:s");
+
+    assertThat(tester.getTestSuiteExpansions())
+        .containsExactly(TestSuiteExpansion.newBuilder().setSuiteLabel("//foo:s").build());
+  }
+
+  @Test
+  public void testSuiteExpansions_singleTestSuite() throws Exception {
+    tester.addFile(
+        "foo/BUILD",
+        "test_suite(name = 's', tests = ['t1', 't2'])",
+        "sh_test(name = 't1', srcs = [])",
+        "sh_test(name = 't2', srcs = [])");
+
+    tester.load("//foo:s");
+
+    assertThat(tester.getTestSuiteExpansions())
+        .ignoringRepeatedFieldOrder()
+        .containsExactly(
+            TestSuiteExpansion.newBuilder()
+                .setSuiteLabel("//foo:s")
+                .addTestLabels("//foo:t1")
+                .addTestLabels("//foo:t2")
+                .build());
+  }
+
+  @Test
+  public void testSuiteExpansions_multipleTestSuites() throws Exception {
+    tester.addFile(
+        "foo/BUILD",
+        "test_suite(name = 's1', tests = ['t1', 't2'])",
+        "test_suite(name = 's2', tests = ['t3'])",
+        "sh_test(name = 't1', srcs = [])",
+        "sh_test(name = 't2', srcs = [])",
+        "sh_test(name = 't3', srcs = [])");
+
+    tester.load("//foo:s1", "//foo:s2");
+
+    assertThat(tester.getTestSuiteExpansions())
+        .ignoringRepeatedFieldOrder()
+        .containsExactly(
+            TestSuiteExpansion.newBuilder()
+                .setSuiteLabel("//foo:s1")
+                .addTestLabels("//foo:t1")
+                .addTestLabels("//foo:t2")
+                .build(),
+            TestSuiteExpansion.newBuilder()
+                .setSuiteLabel("//foo:s2")
+                .addTestLabels("//foo:t3")
+                .build());
+  }
+
+  @Test
+  public void testSuiteExpansions_overlappingTestSuites() throws Exception {
+    tester.addFile(
+        "foo/BUILD",
+        "test_suite(name = 's1', tests = ['t1', 't2'])",
+        "test_suite(name = 's2', tests = ['t2', 't3'])",
+        "sh_test(name = 't1', srcs = [])",
+        "sh_test(name = 't2', srcs = [])",
+        "sh_test(name = 't3', srcs = [])");
+
+    tester.load("//foo:s1", "//foo:s2");
+
+    assertThat(tester.getTestSuiteExpansions())
+        .ignoringRepeatedFieldOrder()
+        .containsExactly(
+            TestSuiteExpansion.newBuilder()
+                .setSuiteLabel("//foo:s1")
+                .addTestLabels("//foo:t1")
+                .addTestLabels("//foo:t2")
+                .build(),
+            TestSuiteExpansion.newBuilder()
+                .setSuiteLabel("//foo:s2")
+                .addTestLabels("//foo:t2")
+                .addTestLabels("//foo:t3")
+                .build());
+  }
+
+  @Test
+  public void testSuiteExpansions_nestedTestSuite() throws Exception {
+    tester.addFile(
+        "foo/BUILD",
+        "test_suite(name = 's1', tests = ['t1', 's2'])",
+        "test_suite(name = 's2', tests = ['t2', 't3'])",
+        "sh_test(name = 't1', srcs = [])",
+        "sh_test(name = 't2', srcs = [])",
+        "sh_test(name = 't3', srcs = [])");
+
+    tester.load("//foo:s1");
+
+    assertThat(tester.getTestSuiteExpansions())
+        .ignoringRepeatedFieldOrder()
+        .containsExactly(
+            TestSuiteExpansion.newBuilder()
+                .setSuiteLabel("//foo:s1")
+                .addTestLabels("//foo:t1")
+                .addTestLabels("//foo:t2")
+                .addTestLabels("//foo:t3")
+                .build());
+  }
+
+  @Test
+  public void testSuiteExpansions_includesTestMatchingNegativePattern() throws Exception {
+    tester.addFile(
+        "foo/BUILD", "test_suite(name = 's', tests = ['t'])", "sh_test(name = 't', srcs = [])");
+
+    tester.load("//foo:s", "-//foo:t");
+
+    assertThat(tester.getTestSuiteExpansions())
+        .containsExactly(
+            TestSuiteExpansion.newBuilder()
+                .setSuiteLabel("//foo:s")
+                .addTestLabels("//foo:t")
+                .build());
+  }
+
+  @Test
+  public void testSuiteExpansions_presentWhenSuiteMatchesWildcard() throws Exception {
+    tester.addFile(
+        "foo/BUILD",
+        "test_suite(name = 's', tests = ['t1'])",
+        "sh_test(name = 't1', srcs = [])",
+        "sh_test(name = 't2', srcs = [])");
+
+    tester.load("//foo:all");
+
+    assertThat(tester.getTestSuiteExpansions())
+        .containsExactly(
+            TestSuiteExpansion.newBuilder()
+                .setSuiteLabel("//foo:s")
+                .addTestLabels("//foo:t1")
+                .build());
+  }
+
+  @Test
+  public void testSuiteExpansions_excludesSuiteMatchingNegativePatten() throws Exception {
+    tester.addFile(
+        "foo/BUILD",
+        "test_suite(name = 's', tests = ['t1'])",
+        "sh_test(name = 't1', srcs = [])",
+        "sh_test(name = 't2', srcs = [])");
+
+    tester.load("//foo:all", "-//foo:s");
+
+    assertThat(tester.getTestSuiteExpansions()).isEmpty();
   }
 
   @Test
   public void testWildcard() throws Exception {
-    tester.addFile("foo/lib/BUILD",
-        "sh_library(name = 'lib2', srcs = ['foo.cc'])");
+    tester.addFile("foo/lib/BUILD", "sh_library(name = 'lib2', srcs = ['foo.cc'])");
     TargetPatternPhaseValue value = assertNoErrors(tester.load("//foo/lib:all-targets"));
     assertThat(value.getTargetLabels())
         .containsExactlyElementsIn(
@@ -926,7 +1078,8 @@ public void testWildcard() throws Exception {
 
   @Test
   public void testWildcardConflict() throws Exception {
-    tester.addFile("foo/lib/BUILD",
+    tester.addFile(
+        "foo/lib/BUILD",
         "cc_library(name = 'lib1')",
         "cc_library(name = 'lib2')",
         "cc_library(name = 'all-targets')",
@@ -939,9 +1092,11 @@ public void testWildcardConflict() throws Exception {
   private void assertWildcardConflict(String label, String suffix) throws Exception {
     TargetPatternPhaseValue value = tester.load(label);
     assertThat(value.getTargetLabels()).containsExactlyElementsIn(getLabels(label));
-    tester.assertContainsWarning(String.format("The target pattern '%s' is ambiguous: '%s' is both "
-        + "a wildcard, and the name of an existing cc_library rule; "
-        + "using the latter interpretation", label, suffix));
+    tester.assertContainsWarning(
+        String.format(
+            "The target pattern '%s' is ambiguous: '%s' is both a wildcard, and the name of an"
+                + " existing cc_library rule; using the latter interpretation",
+            label, suffix));
   }
 
   @Test
@@ -953,16 +1108,14 @@ public void testAbsolutePatternEndsWithSlashAll() throws Exception {
 
   @Test
   public void testRelativeLabel() throws Exception {
-    tester.addFile("base/BUILD",
-        "filegroup(name = 'hello', srcs = ['foo.txt'])");
+    tester.addFile("base/BUILD", "filegroup(name = 'hello', srcs = ['foo.txt'])");
     TargetPatternPhaseValue value = assertNoErrors(tester.load("base:hello"));
     assertThat(value.getTargetLabels()).containsExactlyElementsIn(getLabels("//base:hello"));
   }
 
   @Test
   public void testAbsoluteLabelWithOffset() throws Exception {
-    tester.addFile("base/BUILD",
-        "filegroup(name = 'hello', srcs = ['foo.txt'])");
+    tester.addFile("base/BUILD", "filegroup(name = 'hello', srcs = ['foo.txt'])");
     tester.setRelativeWorkingDirectory("base");
     TargetPatternPhaseValue value = assertNoErrors(tester.load("//base:hello"));
     assertThat(value.getTargetLabels()).containsExactlyElementsIn(getLabels("//base:hello"));
@@ -970,21 +1123,20 @@ public void testAbsoluteLabelWithOffset() throws Exception {
 
   @Test
   public void testRelativeLabelWithOffset() throws Exception {
-    tester.addFile("base/BUILD",
-        "filegroup(name = 'hello', srcs = ['foo.txt'])");
+    tester.addFile("base/BUILD", "filegroup(name = 'hello', srcs = ['foo.txt'])");
     tester.setRelativeWorkingDirectory("base");
     TargetPatternPhaseValue value = assertNoErrors(tester.load(":hello"));
     assertThat(value.getTargetLabels()).containsExactlyElementsIn(getLabels("//base:hello"));
   }
 
-  private void expectError(String pattern, String message) throws Exception {
+  private void expectError(String pattern, String message) {
     TargetParsingException e =
         assertThrows(TargetParsingException.class, () -> tester.load(pattern));
     assertThat(e).hasMessageThat().contains(message);
   }
 
   @Test
-  public void testPatternWithSingleSlashIsError() throws Exception {
+  public void testPatternWithSingleSlashIsError() {
     expectError(
         "/single/slash",
         "not a valid absolute pattern (absolute target patterns must start with exactly "
@@ -992,7 +1144,7 @@ public void testPatternWithSingleSlashIsError() throws Exception {
   }
 
   @Test
-  public void testPatternWithSingleSlashIsErrorAndOffset() throws Exception {
+  public void testPatternWithSingleSlashIsErrorAndOffset() {
     tester.setRelativeWorkingDirectory("base");
     expectError(
         "/single/slash",
@@ -1001,7 +1153,7 @@ public void testPatternWithSingleSlashIsErrorAndOffset() throws Exception {
   }
 
   @Test
-  public void testPatternWithTripleSlashIsError() throws Exception {
+  public void testPatternWithTripleSlashIsError() {
     expectError(
         "///triple/slash",
         "not a valid absolute pattern (absolute target patterns must start with exactly "
@@ -1009,14 +1161,12 @@ public void testPatternWithTripleSlashIsError() throws Exception {
   }
 
   @Test
-  public void testPatternEndingWithSingleSlashIsError() throws Exception {
-    expectError(
-        "foo/",
-        "The package part of 'foo/' should not end in a slash");
+  public void testPatternEndingWithSingleSlashIsError() {
+    expectError("foo/", "The package part of 'foo/' should not end in a slash");
   }
 
   @Test
-  public void testPatternStartingWithDotDotSlash() throws Exception {
+  public void testPatternStartingWithDotDotSlash() {
     expectError(
         "../foo",
         "Bad target pattern '../foo': package name component contains only '.' characters");
@@ -1212,17 +1362,14 @@ public void testExtensionLoadingError_noKeepGoing_someGoodTargetsBeneathDirector
     runTestExtensionLoadingError(/*keepGoing=*/ false, "//...");
   }
 
-  private static class LoadingPhaseTester {
+  private static final class LoadingPhaseTester {
     private final ManualClock clock = new ManualClock();
     private final CustomInMemoryFs fs = new CustomInMemoryFs(clock);
     private final Path workspace;
 
-    private final AnalysisMock analysisMock;
     private final SkyframeExecutor skyframeExecutor;
 
     private final List<Path> changes = new ArrayList<>();
-    private final BlazeDirectories directories;
-    private final ActionKeyContext actionKeyContext = new ActionKeyContext();
 
     private LoadingOptions options;
     private final StoredEventHandler storedErrors;
@@ -1231,20 +1378,20 @@ private static class LoadingPhaseTester {
     private TargetParsingCompleteEvent targetParsingCompleteEvent;
     private LoadingPhaseCompleteEvent loadingPhaseCompleteEvent;
 
-    private MockToolsConfig mockToolsConfig;
+    private final MockToolsConfig mockToolsConfig;
 
-    public LoadingPhaseTester() throws IOException {
+    LoadingPhaseTester() throws IOException {
       this.workspace = fs.getPath("/workspace");
       workspace.createDirectory();
       mockToolsConfig = new MockToolsConfig(workspace);
-      analysisMock = AnalysisMock.get();
+      AnalysisMock analysisMock = AnalysisMock.get();
       analysisMock.setupMockClient(mockToolsConfig);
-      directories =
+      BlazeDirectories directories =
           new BlazeDirectories(
               new ServerDirectories(
                   fs.getPath("/install"), fs.getPath("/output"), fs.getPath("/userRoot")),
               workspace,
-              /* defaultSystemJavabase= */ null,
+              /*defaultSystemJavabase=*/ null,
               analysisMock.getProductName());
       workspace.getRelative("base").deleteTree();
 
@@ -1259,6 +1406,7 @@ public LoadingPhaseTester() throws IOException {
       } catch (OptionsParsingException e) {
         throw new RuntimeException(e);
       }
+      ActionKeyContext actionKeyContext = new ActionKeyContext();
       skyframeExecutor =
           BazelSkyframeExecutorConstants.newBazelSkyframeExecutorBuilder()
               .setPkgFactory(pkgFactory)
@@ -1291,13 +1439,13 @@ public LoadingPhaseTester() throws IOException {
           packageOptions,
           Options.getDefaults(BuildLanguageOptions.class),
           UUID.randomUUID(),
-          ImmutableMap.<String, String>of(),
+          ImmutableMap.of(),
           new TimestampGranularityMonitor(clock));
-      skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of());
+      skyframeExecutor.setActionEnv(ImmutableMap.of());
       this.options = Options.getDefaults(LoadingOptions.class);
     }
 
-    public void useLoadingOptions(String... options) throws OptionsParsingException {
+    void useLoadingOptions(String... options) throws OptionsParsingException {
       OptionsParser parser = OptionsParser.builder().optionsClasses(LoadingOptions.class).build();
       parser.parse(ImmutableList.copyOf(options));
       this.options = parser.getOptions(LoadingOptions.class);
@@ -1312,22 +1460,22 @@ public void setDeletedPackages(PackageIdentifier... packages) {
     }
 
     public TargetPatternPhaseValue load(String... patterns) throws Exception {
-      return loadWithFlags(/*keepGoing=*/false, /*determineTests=*/false, patterns);
+      return loadWithFlags(/*keepGoing=*/ false, /*determineTests=*/ false, patterns);
     }
 
-    public TargetPatternPhaseValue loadKeepGoing(String... patterns) throws Exception {
-      return loadWithFlags(/*keepGoing=*/true, /*determineTests=*/false, patterns);
+    TargetPatternPhaseValue loadKeepGoing(String... patterns) throws Exception {
+      return loadWithFlags(/*keepGoing=*/ true, /*determineTests=*/ false, patterns);
     }
 
-    public TargetPatternPhaseValue loadTests(String... patterns) throws Exception {
-      return loadWithFlags(/*keepGoing=*/false, /*determineTests=*/true, patterns);
+    TargetPatternPhaseValue loadTests(String... patterns) throws Exception {
+      return loadWithFlags(/*keepGoing=*/ false, /*determineTests=*/ true, patterns);
     }
 
-    public TargetPatternPhaseValue loadTestsKeepGoing(String... patterns) throws Exception {
-      return loadWithFlags(/*keepGoing=*/true, /*determineTests=*/true, patterns);
+    TargetPatternPhaseValue loadTestsKeepGoing(String... patterns) throws Exception {
+      return loadWithFlags(/*keepGoing=*/ true, /*determineTests=*/ true, patterns);
     }
 
-    public TargetPatternPhaseValue loadWithFlags(
+    TargetPatternPhaseValue loadWithFlags(
         boolean keepGoing, boolean determineTests, String... patterns) throws Exception {
       sync();
       storedErrors.clear();
@@ -1389,8 +1537,8 @@ private void sync() throws InterruptedException {
 
     public Target getTarget(String targetName) throws Exception {
       StoredEventHandler eventHandler = new StoredEventHandler();
-      Target target = getPkgManager().getTarget(
-          eventHandler, Label.parseAbsoluteUnchecked(targetName));
+      Target target =
+          getPkgManager().getTarget(eventHandler, Label.parseAbsoluteUnchecked(targetName));
       assertThat(eventHandler.hasErrors()).isFalse();
       return target;
     }
@@ -1399,37 +1547,40 @@ private PackageManager getPkgManager() {
       return skyframeExecutor.getPackageManager();
     }
 
-    public ImmutableSet<Label> getFilteredTargets() {
+    ImmutableSet<Label> getFilteredTargets() {
       return ImmutableSet.copyOf(targetParsingCompleteEvent.getFilteredLabels());
     }
 
-    public ImmutableSet<Label> getTestFilteredTargets() {
+    ImmutableSet<Label> getTestFilteredTargets() {
       return ImmutableSet.copyOf(targetParsingCompleteEvent.getTestFilteredLabels());
     }
 
-    public ImmutableSet<Label> getOriginalTargets() {
+    ImmutableSet<Label> getOriginalTargets() {
       return ImmutableSet.copyOf(targetParsingCompleteEvent.getLabels());
     }
 
-    public ImmutableSetMultimap<String, Label> getOriginalPatternsToLabels() {
+    ImmutableSetMultimap<String, Label> getOriginalPatternsToLabels() {
       return targetParsingCompleteEvent.getOriginalPatternsToLabels();
     }
 
-    public ImmutableSet<Label> getTestSuiteTargets() {
+    ImmutableSet<Label> getTestSuiteTargets() {
       return loadingPhaseCompleteEvent.getFilteredLabels();
     }
 
+    List<TestSuiteExpansion> getTestSuiteExpansions() {
+      return targetParsingCompleteEvent
+          .asStreamProto(null)
+          .getExpanded()
+          .getTestSuiteExpansionsList();
+    }
+
     void throwExceptionOnGetInputStream(Path path, IOException exn) {
       fs.throwExceptionOnGetInputStream(path, exn);
     }
 
     private Iterable<Event> filteredEvents() {
-      return Iterables.filter(storedErrors.getEvents(), new Predicate<Event>() {
-        @Override
-        public boolean apply(Event event) {
-          return event.getKind() != EventKind.PROGRESS;
-        }
-      });
+      return Iterables.filter(
+          storedErrors.getEvents(), event -> event.getKind() != EventKind.PROGRESS);
     }
 
     public void assertNoEvents() {
@@ -1444,24 +1595,17 @@ public Event assertContainsError(String expectedMessage) {
       return MoreAsserts.assertContainsEvent(filteredEvents(), expectedMessage, EventKind.ERRORS);
     }
 
-    public void assertContainsEventWithFrequency(String expectedMessage, int expectedFrequency) {
+    void assertContainsEventWithFrequency(String expectedMessage, int expectedFrequency) {
       MoreAsserts.assertContainsEventWithFrequency(
           filteredEvents(), expectedMessage, expectedFrequency);
     }
 
-    public <T extends Postable> T findPost(Class<T> clazz) {
-      return Iterators.getNext(
-          storedErrors.getPosts().stream().filter(clazz::isInstance).map(clazz::cast).iterator(),
-          null);
+    <T extends Postable> T findPost(Class<T> clazz) {
+      return Iterators.getNext(Iterators.filter(storedErrors.getPosts().iterator(), clazz), null);
     }
 
-    public <T extends Postable> T findPostOnce(Class<T> clazz) {
-      return storedErrors
-          .getPosts()
-          .stream()
-          .filter(clazz::isInstance)
-          .map(clazz::cast)
-          .collect(MoreCollectors.onlyElement());
+    <T extends Postable> T findPostOnce(Class<T> clazz) {
+      return Iterables.getOnlyElement(Iterables.filter(storedErrors.getPosts(), clazz));
     }
   }
 
@@ -1469,8 +1613,7 @@ public <T extends Postable> T findPostOnce(Class<T> clazz) {
    * Custom {@link InMemoryFileSystem} that can be pre-configured per-file to throw a supplied
    * IOException instead of the usual behavior.
    */
-  private static class CustomInMemoryFs extends InMemoryFileSystem {
-
+  private static final class CustomInMemoryFs extends InMemoryFileSystem {
     private final Map<Path, IOException> pathsToErrorOnGetInputStream = Maps.newHashMap();
 
     CustomInMemoryFs(ManualClock manualClock) {
diff --git a/src/test/shell/integration/build_event_stream_test.sh b/src/test/shell/integration/build_event_stream_test.sh
index 71f1a9c6b49a0a..34b00475b21688 100755
--- a/src/test/shell/integration/build_event_stream_test.sh
+++ b/src/test/shell/integration/build_event_stream_test.sh
@@ -415,6 +415,9 @@ function test_suite() {
   expect_not_log 'aborted'
   expect_log 'last_message: true'
   expect_log_once '^build_tool_logs'
+  expect_log_once 'test_suite_expansions'
+  expect_log_once 'suite_label: "//pkg:suite"'
+  expect_log_once 'test_labels: "//pkg:true"'
 }
 
 function test_test_summary() {