diff --git a/test/conformance/enqueue/enqueue_adapter_level_zero.match b/test/conformance/enqueue/enqueue_adapter_level_zero.match
index 4155859eaf..286cafc7fa 100644
--- a/test/conformance/enqueue/enqueue_adapter_level_zero.match
+++ b/test/conformance/enqueue/enqueue_adapter_level_zero.match
@@ -53,19 +53,8 @@
 {{OPT}}urEnqueueMemImageWriteTest.InvalidRegion2D/*
 {{OPT}}urEnqueueMemImageWriteTest.InvalidRegion3D/*
 {{OPT}}urEnqueueKernelLaunchMultiDeviceTest.KernelLaunchReadDifferentQueues/*
-urEnqueueReadHostPipeTest.InvalidEventWaitList/*
-urEnqueueReadHostPipeTest.InvalidNullHandleProgram/*
-urEnqueueReadHostPipeTest.InvalidNullHandleQueue/*
-urEnqueueReadHostPipeTest.InvalidNullPointerBuffer/*
-urEnqueueReadHostPipeTest.InvalidNullPointerPipeSymbol/*
 urEnqueueUSMAdviseTest.InvalidSizeTooLarge/*
-urEnqueueUSMFill2DNegativeTest.OutOfBounds/*
 {{OPT}}urEnqueueUSMMemcpyTest.Blocking/*
 {{OPT}}urEnqueueUSMMemcpyTest.BlockingWithEvent/*
 {{OPT}}urEnqueueUSMMemcpyTest.WaitForDependencies/*
 urEnqueueUSMPrefetchTest.InvalidSizeTooLarge/*
-urEnqueueWriteHostPipeTest.InvalidEventWaitList/*
-urEnqueueWriteHostPipeTest.InvalidNullHandleProgram/*
-urEnqueueWriteHostPipeTest.InvalidNullHandleQueue/*
-urEnqueueWriteHostPipeTest.InvalidNullPointerBuffer/*
-urEnqueueWriteHostPipeTest.InvalidNullPointerPipeSymbol/*
diff --git a/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match b/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match
index 44895d10fa..baa78c8c2d 100644
--- a/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match
+++ b/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match
@@ -69,17 +69,6 @@ urEnqueueKernelLaunchWithVirtualMemory.Success/*
 {{OPT}}urEnqueueMemImageWriteTest.InvalidRegion2D/*
 {{OPT}}urEnqueueMemImageWriteTest.InvalidRegion3D/*
 {{OPT}}urEnqueueKernelLaunchMultiDeviceTest.KernelLaunchReadDifferentQueues/*
-urEnqueueUSMFill2DNegativeTest.OutOfBounds/*
 urEnqueueUSMAdviseTest.InvalidSizeTooLarge/*
 urEnqueueUSMPrefetchTest.InvalidSizeTooLarge/*
-urEnqueueReadHostPipeTest.InvalidNullHandleQueue/*
-urEnqueueReadHostPipeTest.InvalidNullHandleProgram/*
-urEnqueueReadHostPipeTest.InvalidNullPointerPipeSymbol/*
-urEnqueueReadHostPipeTest.InvalidNullPointerBuffer/*
-urEnqueueReadHostPipeTest.InvalidEventWaitList/*
-urEnqueueWriteHostPipeTest.InvalidNullHandleQueue/*
-urEnqueueWriteHostPipeTest.InvalidNullHandleProgram/*
-urEnqueueWriteHostPipeTest.InvalidNullPointerPipeSymbol/*
-urEnqueueWriteHostPipeTest.InvalidNullPointerBuffer/*
-urEnqueueWriteHostPipeTest.InvalidEventWaitList/*
 {{OPT}}urEnqueueTimestampRecordingExpTest.SuccessBlocking/*
diff --git a/test/conformance/enqueue/enqueue_adapter_native_cpu.match b/test/conformance/enqueue/enqueue_adapter_native_cpu.match
index 18abf6abfe..35b9df84de 100644
--- a/test/conformance/enqueue/enqueue_adapter_native_cpu.match
+++ b/test/conformance/enqueue/enqueue_adapter_native_cpu.match
@@ -139,16 +139,6 @@ urEnqueueEventsWaitWithBarrierOrderingTest.SuccessNonEventDependencies/*_
 {{OPT}}urEnqueueUSMPrefetchTest.InvalidSizeZero/*
 {{OPT}}urEnqueueUSMPrefetchTest.InvalidSizeTooLarge/*
 {{OPT}}urEnqueueUSMPrefetchTest.InvalidEventWaitList/*
-{{OPT}}urEnqueueReadHostPipeTest.InvalidNullHandleQueue/*
-{{OPT}}urEnqueueReadHostPipeTest.InvalidNullHandleProgram/*
-{{OPT}}urEnqueueReadHostPipeTest.InvalidNullPointerPipeSymbol/*
-{{OPT}}urEnqueueReadHostPipeTest.InvalidNullPointerBuffer/*
-{{OPT}}urEnqueueReadHostPipeTest.InvalidEventWaitList/*
-{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullHandleQueue/*
-{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullHandleProgram/*
-{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullPointerPipeSymbol/*
-{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullPointerBuffer/*
-{{OPT}}urEnqueueWriteHostPipeTest.InvalidEventWaitList/*
 urEnqueueKernelLaunchIncrementMultiDeviceMultiThreadTest.Success/*
 urEnqueueKernelLaunchIncrementMultiDeviceTest.Success/*
 urEnqueueKernelLaunchIncrementTest.Success/*
diff --git a/test/conformance/enqueue/urEnqueueUSMFill2D.cpp b/test/conformance/enqueue/urEnqueueUSMFill2D.cpp
index 29123b57bd..e5d3186b81 100644
--- a/test/conformance/enqueue/urEnqueueUSMFill2D.cpp
+++ b/test/conformance/enqueue/urEnqueueUSMFill2D.cpp
@@ -134,9 +134,9 @@ TEST_P(urEnqueueUSMFill2DTestWithParam, Success) {
 
     ur_event_handle_t event = nullptr;
 
-    ASSERT_SUCCESS(urEnqueueUSMFill2D(queue, ptr, pitch, pattern_size,
-                                      pattern.data(), width, height, 0, nullptr,
-                                      &event));
+    UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+        urEnqueueUSMFill2D(queue, ptr, pitch, pattern_size, pattern.data(),
+                           width, height, 0, nullptr, &event));
     EXPECT_SUCCESS(urQueueFlush(queue));
 
     ASSERT_SUCCESS(urEventWait(1, &event));
@@ -161,6 +161,11 @@ struct urEnqueueUSMFill2DNegativeTest : uur::urQueueTest {
 
         ASSERT_SUCCESS(urUSMDeviceAlloc(context, device, nullptr, nullptr,
                                         allocation_size, &ptr));
+
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+            urEnqueueUSMFill2D(queue, ptr, pitch, pattern_size, pattern.data(),
+                               width, height, 0, nullptr, nullptr));
+        ASSERT_SUCCESS(urQueueFinish(queue));
     }
 
     void TearDown() override {
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
index 6e2cadd29a..2bad1c1df1 100644
--- a/test/conformance/testing/include/uur/fixtures.h
+++ b/test/conformance/testing/include/uur/fixtures.h
@@ -379,7 +379,7 @@ struct urHostPipeTest : urQueueTest {
             platform, context, device, *il_binary, nullptr, &program));
 
         size_t size = 0;
-        ASSERT_SUCCESS(urDeviceGetInfo(
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urDeviceGetInfo(
             device, UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED, 0, nullptr,
             &size));
         ASSERT_NE(size, 0);