1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
index ffea8bcc9f..5f41e3d4ec 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
@@ -306,8 +306,10 @@ public class TestAspects {
       @Override
       public AspectParameters apply(Rule rule) {
         if (rule.isAttrDefined("baz", STRING)) {
-          return new AspectParameters.Builder().addAttribute("baz",
-              rule.getAttributeContainer().getAttr("baz").toString()).build();
+          String value = rule.getAttributeContainer().getAttr("baz").toString();
+          if (!value.equals("")) {
+            return new AspectParameters.Builder().addAttribute("baz", value).build();
+          }
         }
         return AspectParameters.EMPTY;
       }