diff --git a/tests/integration/ray_test.go b/tests/integration/ray_test.go
index 7448fba7..503bbffd 100644
--- a/tests/integration/ray_test.go
+++ b/tests/integration/ray_test.go
@@ -112,7 +112,7 @@ func TestRayCluster(t *testing.T) {
 	dashboardHostname := dashboard.Status.Ingress[0].Host
 
 	rayClient := support.NewRayClusterClient(url.URL{Scheme: "http", Host: dashboardHostname})
-	defer support.WriteRayJobAPILogs(test, rayClient, support.GetRayJobId(test, rayJob.Namespace, rayJob.Name))
+	defer writeRayJobAPILogs(test, rayClient, rayJob.Namespace, rayJob.Name)
 
 	test.T().Logf("Waiting for RayJob %s/%s to complete", rayJob.Namespace, rayJob.Name)
 	test.Eventually(support.RayJob(test, rayJob.Namespace, rayJob.Name), support.TestTimeoutLong).
@@ -123,6 +123,11 @@ func TestRayCluster(t *testing.T) {
 		To(WithTransform(support.RayJobStatus, Equal(rayv1alpha1.JobStatusSucceeded)))
 }
 
+func writeRayJobAPILogs(test support.Test, rayClient support.RayClusterClient, rayJobNamespace string, rayJobName string) {
+	// Stored in a separate function so GetRayJobId call is also deferred
+	support.WriteRayJobAPILogs(test, rayClient, support.GetRayJobId(test, rayJobNamespace, rayJobName))
+}
+
 func TestRayJobSubmissionRest(t *testing.T) {
 	test := support.With(t)
 	test.T().Parallel()