diff --git a/test/benchmark/config/nighthawk-client.yaml b/test/benchmark/config/nighthawk-client.yaml
index a9621d3fb7..35553eda6c 100644
--- a/test/benchmark/config/nighthawk-client.yaml
+++ b/test/benchmark/config/nighthawk-client.yaml
@@ -11,6 +11,7 @@ spec:
         - name: nighthawk-client
           image: envoyproxy/nighthawk-dev:latest
           imagePullPolicy: IfNotPresent
-          args: ["nighthawk_client"]  # Fill-up args at runtime
+          command:
+            - /usr/local/bin/nighthawk_client
       restartPolicy: Never
   backoffLimit: 3
diff --git a/test/benchmark/config/nighthawk-test-server.yaml b/test/benchmark/config/nighthawk-test-server.yaml
index dfd91aae46..75fa0bfbd6 100644
--- a/test/benchmark/config/nighthawk-test-server.yaml
+++ b/test/benchmark/config/nighthawk-test-server.yaml
@@ -19,7 +19,7 @@ spec:
         - name: nighthawk-server
           image: envoyproxy/nighthawk-dev:latest
           imagePullPolicy: IfNotPresent
-          args: ["nighthawk_test_server", "-c", "/etc/test-server-config/nighthawk-test-server-config.yaml"]
+          args: ["-c", "/etc/test-server-config/nighthawk-test-server-config.yaml"]
           ports:
             - containerPort: 8080
           volumeMounts:
diff --git a/test/benchmark/suite/suite.go b/test/benchmark/suite/suite.go
index 1ecea3a1d0..256d7919f7 100644
--- a/test/benchmark/suite/suite.go
+++ b/test/benchmark/suite/suite.go
@@ -191,7 +191,7 @@ func (b *BenchmarkTestSuite) Benchmark(t *testing.T, ctx context.Context, jobNam
 	for i := 1; i <= host; i++ {
 		requestHeaders = append(requestHeaders, "Host: "+fmt.Sprintf(hostnamePattern, i))
 	}
-	jobNN, err := b.createBenchmarkClientJob(ctx, jobName, gatewayHostPort, requestHeaders)
+	jobNN, err := b.createBenchmarkClientJob(t, jobName, gatewayHostPort, requestHeaders)
 	if err != nil {
 		return nil, err
 	}
@@ -251,7 +251,7 @@ func (b *BenchmarkTestSuite) Benchmark(t *testing.T, ctx context.Context, jobNam
 	return report, nil
 }
 
-func (b *BenchmarkTestSuite) createBenchmarkClientJob(ctx context.Context, name, gatewayHostPort string, requestHeaders []string) (*types.NamespacedName, error) {
+func (b *BenchmarkTestSuite) createBenchmarkClientJob(t *testing.T, name, gatewayHostPort string, requestHeaders []string) (*types.NamespacedName, error) {
 	job := b.BenchmarkClientJob.DeepCopy()
 	job.SetName(name)
 	job.SetLabels(map[string]string{
@@ -262,7 +262,8 @@ func (b *BenchmarkTestSuite) createBenchmarkClientJob(ctx context.Context, name,
 	container := &job.Spec.Template.Spec.Containers[0]
 	container.Args = append(container.Args, runtimeArgs...)
 
-	if err := b.CreateResource(ctx, job); err != nil {
+	t.Logf("Creating benchmark client job: %s with args: %v", name, job)
+	if err := b.CreateResource(t.Context(), job); err != nil {
 		return nil, err
 	}