diff --git a/pkg/solana/client/test_helpers.go b/pkg/solana/client/test_helpers.go
index 12374bee6..1e766c02a 100644
--- a/pkg/solana/client/test_helpers.go
+++ b/pkg/solana/client/test_helpers.go
@@ -2,7 +2,6 @@ package client
 
 import (
 	"bytes"
-	"context"
 	"os/exec"
 	"testing"
 	"time"
@@ -13,6 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/utils"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 )
 
 // SetupLocalSolNode sets up a local solana node via solana cli, and returns the url
@@ -24,6 +24,7 @@ func SetupLocalSolNode(t *testing.T) string {
 		"--reset",
 		"--rpc-port", port,
 		"--faucet-port", faucetPort,
+		"--ledger", t.TempDir(),
 	)
 	var stdErr bytes.Buffer
 	cmd.Stderr = &stdErr
@@ -34,7 +35,7 @@ func SetupLocalSolNode(t *testing.T) string {
 		assert.NoError(t, cmd.Process.Kill())
 		if err2 := cmd.Wait(); assert.Error(t, err2) {
 			if !assert.Contains(t, err2.Error(), "signal: killed", cmd.ProcessState.String()) {
-				t.Log("solana-test-validator stderr:", stdErr.String())
+				t.Logf("solana-test-validator\n stdout: %s\n stderr: %s", stdOut.String(), stdErr.String())
 			}
 		}
 	})
@@ -44,7 +45,7 @@ func SetupLocalSolNode(t *testing.T) string {
 	for i := 0; i < 30; i++ {
 		time.Sleep(time.Second)
 		client := rpc.New(url)
-		out, err := client.GetHealth(context.Background())
+		out, err := client.GetHealth(tests.Context(t))
 		if err != nil || out != rpc.HealthOk {
 			t.Logf("API server not ready yet (attempt %d)\n", i+1)
 			continue