diff --git a/test/conformance/event/urEventSetCallback.cpp b/test/conformance/event/urEventSetCallback.cpp
index 18eb8e00db..e238b4534d 100644
--- a/test/conformance/event/urEventSetCallback.cpp
+++ b/test/conformance/event/urEventSetCallback.cpp
@@ -168,20 +168,21 @@ using urEventSetCallbackNegativeTest = uur::event::urEventTest;
 void emptyCallback(ur_event_handle_t hEvent, ur_execution_info_t execStatus,
                    void *pUserData) {}
 
-TEST_P(urEventSetCallbackNegativeTest, InvalidNullHandle) {
-
+TEST_P(urEventSetCallbackNegativeTest, InvalidNullHandleEvent) {
     ASSERT_EQ_RESULT(
         urEventSetCallback(
             nullptr,
             ur_execution_info_t::UR_EXECUTION_INFO_EXECUTION_INFO_QUEUED,
             emptyCallback, nullptr),
         UR_RESULT_ERROR_INVALID_NULL_HANDLE);
+}
 
+TEST_P(urEventSetCallbackNegativeTest, InvalidNullPointerCallback) {
     ASSERT_EQ_RESULT(
         urEventSetCallback(
             event, ur_execution_info_t::UR_EXECUTION_INFO_EXECUTION_INFO_QUEUED,
             nullptr, nullptr),
-        UR_RESULT_ERROR_INVALID_NULL_HANDLE);
+        UR_RESULT_ERROR_INVALID_NULL_POINTER);
 }
 
 TEST_P(urEventSetCallbackNegativeTest, InvalidEnumeration) {
diff --git a/test/conformance/memory/urMemGetInfo.cpp b/test/conformance/memory/urMemGetInfo.cpp
index 355c2c009d..18ec119681 100644
--- a/test/conformance/memory/urMemGetInfo.cpp
+++ b/test/conformance/memory/urMemGetInfo.cpp
@@ -63,11 +63,11 @@ TEST_P(urMemGetInfoTest, InvalidNullPointerParamValue) {
     size_t mem_size = 0;
     ASSERT_EQ_RESULT(urMemGetInfo(buffer, UR_MEM_INFO_SIZE, sizeof(mem_size),
                                   nullptr, nullptr),
-                     UR_RESULT_ERROR_INVALID_SIZE);
+                     UR_RESULT_ERROR_INVALID_NULL_POINTER);
 }
 
 TEST_P(urMemGetInfoTest, InvalidNullPointerPropSizeRet) {
     ASSERT_EQ_RESULT(
         urMemGetInfo(buffer, UR_MEM_INFO_SIZE, 0, nullptr, nullptr),
-        UR_RESULT_ERROR_INVALID_SIZE);
+        UR_RESULT_ERROR_INVALID_NULL_POINTER);
 }