diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/SpawnBuilder.java b/src/test/java/com/google/devtools/build/lib/exec/util/SpawnBuilder.java
index 0a8b407d64124a..5f3a1aedffb109 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/util/SpawnBuilder.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/util/SpawnBuilder.java
@@ -32,6 +32,7 @@
 import com.google.devtools.build.lib.actions.SimpleSpawn;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.analysis.platform.PlatformInfo;
+import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.ArrayList;
@@ -191,6 +192,12 @@ public SpawnBuilder withInputs(String... names) {
     return this;
   }
 
+  @CanIgnoreReturnValue
+  public SpawnBuilder withInputs(NestedSet<ActionInput> inputs) {
+    this.inputs.addTransitive(inputs);
+    return this;
+  }
+
   @CanIgnoreReturnValue
   public SpawnBuilder withOutput(ActionInput output) {
     outputs.add(output);
@@ -251,6 +258,12 @@ public SpawnBuilder withTools(ActionInput... tools) {
     return this;
   }
 
+  @CanIgnoreReturnValue
+  public SpawnBuilder withTools(NestedSet<ActionInput> tools) {
+    this.tools.addTransitive(tools);
+    return this;
+  }
+
   @CanIgnoreReturnValue
   public SpawnBuilder withLocalResources(ResourceSet resourceSet) {
     this.resourceSet = resourceSet;