diff --git a/test/conformance/kernel/urKernelCreate.cpp b/test/conformance/kernel/urKernelCreate.cpp
index 1489eb34aa..6401abfd63 100644
--- a/test/conformance/kernel/urKernelCreate.cpp
+++ b/test/conformance/kernel/urKernelCreate.cpp
@@ -28,28 +28,28 @@ struct urKernelCreateTest : uur::urProgramTest {
     std::string kernel_name;
     ur_kernel_handle_t kernel = nullptr;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelCreateTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelCreateTest);
 
-TEST_F(urKernelCreateTest, Success) {
+TEST_P(urKernelCreateTest, Success) {
     ASSERT_SUCCESS(urKernelCreate(program, kernel_name.data(), &kernel));
 }
 
-TEST_F(urKernelCreateTest, InvalidNullHandleProgram) {
+TEST_P(urKernelCreateTest, InvalidNullHandleProgram) {
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
                      urKernelCreate(nullptr, kernel_name.data(), &kernel));
 }
 
-TEST_F(urKernelCreateTest, InvalidNullPointerName) {
+TEST_P(urKernelCreateTest, InvalidNullPointerName) {
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
                      urKernelCreate(program, nullptr, &kernel));
 }
 
-TEST_F(urKernelCreateTest, InvalidNullPointerKernel) {
+TEST_P(urKernelCreateTest, InvalidNullPointerKernel) {
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
                      urKernelCreate(program, kernel_name.data(), nullptr));
 }
 
-TEST_F(urKernelCreateTest, InvalidKernelName) {
+TEST_P(urKernelCreateTest, InvalidKernelName) {
     std::string invalid_name = "";
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_KERNEL_NAME,
                      urKernelCreate(program, invalid_name.data(), &kernel));
diff --git a/test/conformance/kernel/urKernelCreateWithNativeHandle.cpp b/test/conformance/kernel/urKernelCreateWithNativeHandle.cpp
index d35f29cb29..5b5a2ea04e 100644
--- a/test/conformance/kernel/urKernelCreateWithNativeHandle.cpp
+++ b/test/conformance/kernel/urKernelCreateWithNativeHandle.cpp
@@ -24,7 +24,7 @@ struct urKernelCreateWithNativeHandleTest : uur::urKernelTest {
         true                                        /*isNativeHandleOwned*/
     };
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelCreateWithNativeHandleTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelCreateWithNativeHandleTest);
 
 TEST_P(urKernelCreateWithNativeHandleTest, Success) {
     ASSERT_SUCCESS(urKernelCreateWithNativeHandle(
diff --git a/test/conformance/kernel/urKernelGetNativeHandle.cpp b/test/conformance/kernel/urKernelGetNativeHandle.cpp
index 08668de6f3..9ec2bf689d 100644
--- a/test/conformance/kernel/urKernelGetNativeHandle.cpp
+++ b/test/conformance/kernel/urKernelGetNativeHandle.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urKernelGetNativeHandleTest = uur::urKernelTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelGetNativeHandleTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelGetNativeHandleTest);
 
 TEST_P(urKernelGetNativeHandleTest, Success) {
     ur_native_handle_t native_kernel_handle = nullptr;
diff --git a/test/conformance/kernel/urKernelRelease.cpp b/test/conformance/kernel/urKernelRelease.cpp
index fd13d0157d..400b16771e 100644
--- a/test/conformance/kernel/urKernelRelease.cpp
+++ b/test/conformance/kernel/urKernelRelease.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urKernelReleaseTest = uur::urKernelTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelReleaseTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelReleaseTest);
 
 TEST_P(urKernelReleaseTest, Success) {
     ASSERT_SUCCESS(urKernelRetain(kernel));
diff --git a/test/conformance/kernel/urKernelRetain.cpp b/test/conformance/kernel/urKernelRetain.cpp
index d5ebfd6748..000fcb1f03 100644
--- a/test/conformance/kernel/urKernelRetain.cpp
+++ b/test/conformance/kernel/urKernelRetain.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urKernelRetainTest = uur::urKernelTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelRetainTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelRetainTest);
 
 TEST_P(urKernelRetainTest, Success) {
     ASSERT_SUCCESS(urKernelRetain(kernel));
diff --git a/test/conformance/kernel/urKernelSetArgLocal.cpp b/test/conformance/kernel/urKernelSetArgLocal.cpp
index 737953413e..99e26b3c85 100644
--- a/test/conformance/kernel/urKernelSetArgLocal.cpp
+++ b/test/conformance/kernel/urKernelSetArgLocal.cpp
@@ -10,7 +10,7 @@ struct urKernelSetArgLocalTest : uur::urKernelTest {
     }
     size_t local_mem_size = 4 * sizeof(uint32_t);
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetArgLocalTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgLocalTest);
 
 TEST_P(urKernelSetArgLocalTest, Success) {
     ASSERT_SUCCESS(urKernelSetArgLocal(kernel, 1, local_mem_size));
diff --git a/test/conformance/kernel/urKernelSetArgMemObj.cpp b/test/conformance/kernel/urKernelSetArgMemObj.cpp
index b56a5b820d..288cfb0f47 100644
--- a/test/conformance/kernel/urKernelSetArgMemObj.cpp
+++ b/test/conformance/kernel/urKernelSetArgMemObj.cpp
@@ -19,9 +19,9 @@ struct urKernelSetArgMemObjTest : uur::urKernelTest {
         UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::TearDown());
     }
 
-    ur_mem_handle_t buffer;
+    ur_mem_handle_t buffer = nullptr;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetArgMemObjTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgMemObjTest);
 
 TEST_P(urKernelSetArgMemObjTest, Success) {
     ASSERT_SUCCESS(urKernelSetArgMemObj(kernel, 0, buffer));
diff --git a/test/conformance/kernel/urKernelSetArgPointer.cpp b/test/conformance/kernel/urKernelSetArgPointer.cpp
index a06948b2c9..20e274916d 100644
--- a/test/conformance/kernel/urKernelSetArgPointer.cpp
+++ b/test/conformance/kernel/urKernelSetArgPointer.cpp
@@ -19,7 +19,7 @@ struct urKernelSetArgPointerTest : uur::urKernelTest {
     void *allocation = nullptr;
     size_t allocation_size = 16 * sizeof(uint32_t);
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetArgPointerTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgPointerTest);
 
 TEST_P(urKernelSetArgPointerTest, SuccessHost) {
     bool host_supported = false;
@@ -104,7 +104,7 @@ struct urKernelSetArgPointerNegativeTest : urKernelSetArgPointerTest {
         UUR_RETURN_ON_FATAL_FAILURE(urKernelSetArgPointerTest::SetUp());
     }
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetArgPointerNegativeTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgPointerNegativeTest);
 
 TEST_P(urKernelSetArgPointerNegativeTest, InvalidNullHandleKernel) {
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
diff --git a/test/conformance/kernel/urKernelSetArgSampler.cpp b/test/conformance/kernel/urKernelSetArgSampler.cpp
index 65089f1f38..cab2ea84da 100644
--- a/test/conformance/kernel/urKernelSetArgSampler.cpp
+++ b/test/conformance/kernel/urKernelSetArgSampler.cpp
@@ -26,7 +26,7 @@ struct urKernelSetArgSamplerTest : uur::urKernelTest {
 
     ur_sampler_handle_t sampler = nullptr;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetArgSamplerTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgSamplerTest);
 
 TEST_P(urKernelSetArgSamplerTest, Success) {
     ASSERT_SUCCESS(urKernelSetArgSampler(kernel, 2, sampler));
diff --git a/test/conformance/kernel/urKernelSetArgValue.cpp b/test/conformance/kernel/urKernelSetArgValue.cpp
index 0107c4ee2c..ca19b64955 100644
--- a/test/conformance/kernel/urKernelSetArgValue.cpp
+++ b/test/conformance/kernel/urKernelSetArgValue.cpp
@@ -11,7 +11,7 @@ struct urKernelSetArgValueTest : uur::urKernelTest {
 
     uint32_t arg_value = 42;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetArgValueTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgValueTest);
 
 TEST_P(urKernelSetArgValueTest, Success) {
     ASSERT_SUCCESS(
diff --git a/test/conformance/kernel/urKernelSetExecInfo.cpp b/test/conformance/kernel/urKernelSetExecInfo.cpp
index 55e7295e82..9246258fc1 100644
--- a/test/conformance/kernel/urKernelSetExecInfo.cpp
+++ b/test/conformance/kernel/urKernelSetExecInfo.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urKernelSetExecInfoTest = uur::urKernelTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetExecInfoTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetExecInfoTest);
 
 TEST_P(urKernelSetExecInfoTest, SuccessIndirectAccess) {
     bool property_value = false;
@@ -53,7 +53,7 @@ struct urKernelSetExecInfoUSMPointersTest : uur::urKernelTest {
     size_t allocation_size = 16;
     void *allocation = nullptr;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetExecInfoUSMPointersTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetExecInfoUSMPointersTest);
 
 TEST_P(urKernelSetExecInfoUSMPointersTest, SuccessHost) {
     bool host_supported = false;
diff --git a/test/conformance/kernel/urKernelSetSpecializationConstants.cpp b/test/conformance/kernel/urKernelSetSpecializationConstants.cpp
index 8d02afc1ce..251763df50 100644
--- a/test/conformance/kernel/urKernelSetSpecializationConstants.cpp
+++ b/test/conformance/kernel/urKernelSetSpecializationConstants.cpp
@@ -22,7 +22,7 @@ struct urKernelSetSpecializationConstantsTest : uur::urKernelTest {
     ur_specialization_constant_info_t info = {0, sizeof(spec_value),
                                               &spec_value};
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urKernelSetSpecializationConstantsTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetSpecializationConstantsTest);
 
 TEST_P(urKernelSetSpecializationConstantsTest, Success) {
     ASSERT_SUCCESS(urKernelSetSpecializationConstants(kernel, 1, &info));
diff --git a/test/conformance/program/urProgramBuild.cpp b/test/conformance/program/urProgramBuild.cpp
index b1e4f5a8b4..3a281da4a2 100644
--- a/test/conformance/program/urProgramBuild.cpp
+++ b/test/conformance/program/urProgramBuild.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urProgramBuildTest = uur::urProgramTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramBuildTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramBuildTest);
 
 TEST_P(urProgramBuildTest, Success) {
     ASSERT_SUCCESS(urProgramBuild(context, program, nullptr));
diff --git a/test/conformance/program/urProgramCompile.cpp b/test/conformance/program/urProgramCompile.cpp
index fe51a5b8b7..b217f518fb 100644
--- a/test/conformance/program/urProgramCompile.cpp
+++ b/test/conformance/program/urProgramCompile.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urProgramCompileTest = uur::urProgramTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramCompileTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramCompileTest);
 
 TEST_P(urProgramCompileTest, Success) {
     ASSERT_SUCCESS(urProgramCompile(context, program, nullptr));
diff --git a/test/conformance/program/urProgramCreateWithBinary.cpp b/test/conformance/program/urProgramCreateWithBinary.cpp
index 0b8ca0c524..ca21175cc7 100644
--- a/test/conformance/program/urProgramCreateWithBinary.cpp
+++ b/test/conformance/program/urProgramCreateWithBinary.cpp
@@ -25,7 +25,7 @@ struct urProgramCreateWithBinaryTest : uur::urProgramTest {
     std::vector<uint8_t> binary;
     ur_program_handle_t binary_program = nullptr;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramCreateWithBinaryTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramCreateWithBinaryTest);
 
 TEST_P(urProgramCreateWithBinaryTest, Success) {
     ASSERT_SUCCESS(urProgramCreateWithBinary(context, device, binary.size(),
diff --git a/test/conformance/program/urProgramCreateWithIL.cpp b/test/conformance/program/urProgramCreateWithIL.cpp
index 2c47b11a7f..ca369e78f6 100644
--- a/test/conformance/program/urProgramCreateWithIL.cpp
+++ b/test/conformance/program/urProgramCreateWithIL.cpp
@@ -15,7 +15,7 @@ struct urProgramCreateWithILTest : uur::urContextTest {
 
     std::shared_ptr<std::vector<char>> il_binary;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramCreateWithILTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramCreateWithILTest);
 
 TEST_P(urProgramCreateWithILTest, Success) {
     ur_program_handle_t program = nullptr;
diff --git a/test/conformance/program/urProgramCreateWithNativeHandle.cpp b/test/conformance/program/urProgramCreateWithNativeHandle.cpp
index c1bda447df..9afd289759 100644
--- a/test/conformance/program/urProgramCreateWithNativeHandle.cpp
+++ b/test/conformance/program/urProgramCreateWithNativeHandle.cpp
@@ -20,7 +20,7 @@ struct urProgramCreateWithNativeHandleTest : uur::urProgramTest {
     ur_native_handle_t native_program_handle = nullptr;
     ur_program_handle_t native_program = nullptr;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramCreateWithNativeHandleTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramCreateWithNativeHandleTest);
 
 TEST_P(urProgramCreateWithNativeHandleTest, Success) {
     ASSERT_SUCCESS(urProgramCreateWithNativeHandle(native_program_handle,
diff --git a/test/conformance/program/urProgramGetFunctionPointer.cpp b/test/conformance/program/urProgramGetFunctionPointer.cpp
index 3565050b21..d33bb7e9d3 100644
--- a/test/conformance/program/urProgramGetFunctionPointer.cpp
+++ b/test/conformance/program/urProgramGetFunctionPointer.cpp
@@ -20,7 +20,7 @@ struct urProgramGetFunctionPointerTest : uur::urProgramTest {
 
     std::string function_name;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramGetFunctionPointerTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramGetFunctionPointerTest);
 
 TEST_P(urProgramGetFunctionPointerTest, Success) {
     void *function_pointer = nullptr;
diff --git a/test/conformance/program/urProgramGetNativeHandle.cpp b/test/conformance/program/urProgramGetNativeHandle.cpp
index 90c0d6ef98..ba5ae3a31d 100644
--- a/test/conformance/program/urProgramGetNativeHandle.cpp
+++ b/test/conformance/program/urProgramGetNativeHandle.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urProgramGetNativeHandleTest = uur::urProgramTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramGetNativeHandleTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramGetNativeHandleTest);
 
 TEST_P(urProgramGetNativeHandleTest, Success) {
     ur_native_handle_t native_program_handle = nullptr;
diff --git a/test/conformance/program/urProgramLink.cpp b/test/conformance/program/urProgramLink.cpp
index 58abcfa687..72e14a2777 100644
--- a/test/conformance/program/urProgramLink.cpp
+++ b/test/conformance/program/urProgramLink.cpp
@@ -32,7 +32,7 @@ struct urProgramLinkTest : uur::urProgramTest {
     std::shared_ptr<std::vector<char>> bar_binary;
     std::vector<ur_program_handle_t> programs;
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramLinkTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramLinkTest);
 
 TEST_P(urProgramLinkTest, Success) {
     ASSERT_SUCCESS(urProgramLink(context, programs.size(), programs.data(),
diff --git a/test/conformance/program/urProgramRelease.cpp b/test/conformance/program/urProgramRelease.cpp
index 74b4e3bd3e..90c52c46b1 100644
--- a/test/conformance/program/urProgramRelease.cpp
+++ b/test/conformance/program/urProgramRelease.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urProgramReleaseTest = uur::urProgramTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramReleaseTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramReleaseTest);
 
 TEST_P(urProgramReleaseTest, Success) {
     ASSERT_SUCCESS(urProgramRetain(program));
diff --git a/test/conformance/program/urProgramRetain.cpp b/test/conformance/program/urProgramRetain.cpp
index ddff3515cb..7ff4747e32 100644
--- a/test/conformance/program/urProgramRetain.cpp
+++ b/test/conformance/program/urProgramRetain.cpp
@@ -4,7 +4,7 @@
 #include <uur/fixtures.h>
 
 using urProgramRetainTest = uur::urProgramTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramRetainTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramRetainTest);
 
 TEST_P(urProgramRetainTest, Success) {
     ASSERT_SUCCESS(urProgramRetain(program));
diff --git a/test/conformance/program/urProgramSetSpecializationConstants.cpp b/test/conformance/program/urProgramSetSpecializationConstants.cpp
index 16474fe624..de5594a75d 100644
--- a/test/conformance/program/urProgramSetSpecializationConstants.cpp
+++ b/test/conformance/program/urProgramSetSpecializationConstants.cpp
@@ -8,7 +8,7 @@ struct urProgramSetSpecializationConstantsTest : uur::urProgramTest {
     ur_specialization_constant_info_t info = {0, sizeof(spec_value),
                                               &spec_value};
 };
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urProgramSetSpecializationConstantsTest);
+UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramSetSpecializationConstantsTest);
 
 TEST_P(urProgramSetSpecializationConstantsTest, Success) {
     ASSERT_SUCCESS(urProgramSetSpecializationConstants(program, 1, &info));
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
index 5ed572af55..0390db308f 100644
--- a/test/conformance/testing/include/uur/fixtures.h
+++ b/test/conformance/testing/include/uur/fixtures.h
@@ -97,6 +97,14 @@ struct urDeviceTest : urPlatformTest,
             return uur::GetPlatformAndDeviceName(info.param);                  \
         })
 
+#define UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(FIXTURE)                           \
+    INSTANTIATE_TEST_SUITE_P(                                                  \
+        , FIXTURE,                                                             \
+        ::testing::ValuesIn(uur::KernelsEnvironment::instance->devices),       \
+        [](const ::testing::TestParamInfo<ur_device_handle_t> &info) {         \
+            return uur::GetPlatformAndDeviceName(info.param);                  \
+        })
+
 namespace uur {
 
 template <class T>