diff --git a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListener.java b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListener.java
index f132c2eb..f792337b 100644
--- a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListener.java
+++ b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListener.java
@@ -108,8 +108,11 @@ private Map<TestData, List<TestData>> matchTestCasesToSuites_locked(
       // In all cases we're looking for the "class" segment, pull the UniqueID and map that from the
       // results
       List<UniqueId.Segment> segments = testCase.getId().getUniqueIdObject().getSegments();
-
-      if (segments.size() == 3 || segments.size() == 5) {
+      
+      if (segments.size() == 2) {
+        parent = results.get(testCase.getId().getUniqueIdObject());
+      }
+      else if (segments.size() == 3 || segments.size() == 5) {
         // get class / test data up one level
         parent =
             testCase
@@ -161,7 +164,7 @@ private List<TestData> findTestCases_locked() {
               // are identified by the fact that they have no child test cases in the
               // test plan, or they are marked as tests.
               TestIdentifier id = result.getId();
-              return id.isTest() || testPlan.getChildren(id).isEmpty();
+              return id.getSource() != null || id.isTest() || testPlan.getChildren(id).isEmpty();
             })
         .collect(Collectors.toList());
   }
diff --git a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java
index 4feb54a6..7047e7b1 100644
--- a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java
+++ b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java
@@ -146,4 +146,17 @@ public boolean isDynamic() {
   public Instant getStarted() {
     return this.started;
   }
+
+  @Override
+  public String toString() {
+    return "TestData{" +
+        "id=" + id +
+        ", reportEntries=" + reportEntries +
+        ", started=" + started +
+        ", finished=" + finished +
+        ", reason='" + reason + '\'' +
+        ", result=" + result +
+        ", dynamic=" + dynamic +
+        '}';
+  }
 }