diff --git a/services/gateway/client/client.go b/services/gateway/client/client.go
index a3a4214..ed64689 100644
--- a/services/gateway/client/client.go
+++ b/services/gateway/client/client.go
@@ -457,7 +457,7 @@ func (c *Client) GetRun(ctx context.Context, runID string) (*gwapitypes.RunRespo
 
 func (c *Client) GetRunTask(ctx context.Context, runID, taskID string) (*gwapitypes.RunTaskResponse, *http.Response, error) {
 	task := new(gwapitypes.RunTaskResponse)
-	resp, err := c.getParsedResponse(ctx, "GET", fmt.Sprintf("/run/%s/task/%s", runID, taskID), nil, jsonContent, nil, task)
+	resp, err := c.getParsedResponse(ctx, "GET", fmt.Sprintf("/runs/%s/tasks/%s", runID, taskID), nil, jsonContent, nil, task)
 	return task, resp, err
 }
 
diff --git a/tests/setup_test.go b/tests/setup_test.go
index a471e79..0e0b3a4 100644
--- a/tests/setup_test.go
+++ b/tests/setup_test.go
@@ -1254,6 +1254,9 @@ func TestDirectRunLogs(t *testing.T) {
 				if err != nil {
 					return false, nil
 				}
+				if tt.step >= len(t.Steps) {
+					return true, nil
+				}
 				if !t.Steps[tt.step].LogArchived {
 					return false, nil
 				}