1 files changed, 5 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestSuiteBuilder.java b/src/test/java/com/google/devtools/build/lib/testutil/TestSuiteBuilder.java
index 00be92b4e2..f6588cbdb0 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestSuiteBuilder.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestSuiteBuilder.java
@@ -81,12 +81,14 @@ public final class TestSuiteBuilder {
    */
   public Set<Class<?>> create() {
     Set<Class<?>> result = new LinkedHashSet<>();
-    // We have some cases where the resulting test suite is empty, which some of our test
-    // infrastructure treats as an error.
-    result.add(TautologyTest.class);
     for (Class<?> testClass : Iterables.filter(testClasses, matchClassPredicate)) {
       result.add(testClass);
     }
+    if (result.isEmpty()) {
+      // We have some cases where the resulting test suite is empty, which some of our test
+      // infrastructure treats as an error.
+      result.add(TautologyTest.class);
+    }
     return result;
   }