diff --git a/test_conformance/extensions/cl_khr_kernel_clock/kernel_clock.cpp b/test_conformance/extensions/cl_khr_kernel_clock/kernel_clock.cpp
index 06a262d89..744083a93 100644
--- a/test_conformance/extensions/cl_khr_kernel_clock/kernel_clock.cpp
+++ b/test_conformance/extensions/cl_khr_kernel_clock/kernel_clock.cpp
@@ -109,21 +109,14 @@ class KernelClockTest {
 
             ptr = kernel_src;
 
-            error = create_single_kernel_helper_create_program(
-                context, &program, 1, &ptr);
+            error = create_single_kernel_helper(context, &program, &kernel, 1,
+                                                &ptr, "SampleClock");
             test_error(error, "Failed to create program with source");
 
-            error =
-                clBuildProgram(program, 1, &device, nullptr, nullptr, nullptr);
-            test_error(error, "Failed to build program");
-
             out_mem = clCreateBuffer(context, CL_MEM_WRITE_ONLY,
                                      sizeof(cl_uint), nullptr, &error);
             test_error(error, "clCreateBuffer failed");
 
-            kernel = clCreateKernel(program, "SampleClock", &error);
-            test_error(error, "Failed to create kernel");
-
             error = clSetKernelArg(kernel, 0, sizeof(out_mem), &out_mem);
             test_error(error, "clSetKernelArg failed");