diff --git a/test/robot/scheduler/trace.go b/test/robot/scheduler/trace.go
index a034d489df..cdad0b31ad 100644
--- a/test/robot/scheduler/trace.go
+++ b/test/robot/scheduler/trace.go
@@ -33,6 +33,7 @@ func (s schedule) doTrace(ctx context.Context, subj *monitor.Subject, tools *bui
 	input := &trace.Input{
 		Subject:  subj.Id,
 		Obb:      subj.Obb,
+		Gapis:    tools.Host.Gapis,
 		Gapit:    tools.Host.Gapit,
 		GapidApk: androidTools.GapidApk,
 		Package:  s.pkg.Id,
diff --git a/test/robot/trace/client.go b/test/robot/trace/client.go
index c091a88515..111f0f2c90 100644
--- a/test/robot/trace/client.go
+++ b/test/robot/trace/client.go
@@ -119,6 +119,11 @@ func doTrace(ctx context.Context, action string, in *Input, store *stash.Client,
 		return nil, err
 	}
 
+	gapis, err := extractedLayout.Gapis(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	gapit, err := extractedLayout.Gapit(ctx)
 	if err != nil {
 		return nil, err
@@ -137,6 +142,9 @@ func doTrace(ctx context.Context, action string, in *Input, store *stash.Client,
 	if err := store.GetFile(ctx, in.Subject, subject); err != nil {
 		return nil, err
 	}
+	if err := store.GetFile(ctx, in.Gapis, gapis); err != nil {
+		return nil, err
+	}
 	if err := store.GetFile(ctx, in.Gapit, gapit); err != nil {
 		return nil, err
 	}
diff --git a/test/robot/trace/trace.proto b/test/robot/trace/trace.proto
index 7188ee002c..bc8155612f 100644
--- a/test/robot/trace/trace.proto
+++ b/test/robot/trace/trace.proto
@@ -27,6 +27,8 @@ import "core/os/device/device.proto";
 message Input {
   // Subject is the stash id of the trace subject.
   string subject = 1;
+  // Gapis is the stash id of the graphics server tool to use.
+  string gapis = 8;
   // Gapit is the stash id of the graphics analysis tool to use.
   string gapit = 2;
   // GapidApk is the stash id of the gapid.apk to use.