diff --git a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
index ca2cbb5c5b..ea43c27168 100644
--- a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
+++ b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
@@ -90,8 +90,8 @@ SDMA_BLACKLIST=\
 
 # Anything involving CP queue creation is failing on Kaveri. Separate them here for convenience (KFD-336)
 KV_QUEUE_BLACKLIST=\
-"KFDExceptionTest.InvalidBadAddress:"\
-"KFDExceptionTest.InvalidWriteAddress:"\
+"KFDExceptionTest.AddressFault:"\
+"KFDExceptionTest.PermissionFault:"\
 "KFDLocalMemoryTest.*:"\
 "KFDEventTest.Signal*Event*:"\
 "KFDQMTest.CreateQueueStressSingleThreaded:"\
@@ -122,7 +122,7 @@ FILTER[hawaii]=\
 FILTER[carrizo]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$SDMA_BLACKLIST:"\
-"KFDExceptionTest.InvalidWriteAddress"
+"KFDExceptionTest.PermissionFault"
 
 # KFDPerfCountersTest.*Trace fail (KFD-339)
 # KFDMemoryTest.QueryPointerInfo/MemoryRegister* (KFD-341)
@@ -172,8 +172,8 @@ FILTER[vega20]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$SDMA_BLACKLIST:"\
 "KFDEvictTest.BurstyTest:"\
-"KFDExceptionTest.InvalidBadAddress:"\
-"KFDExceptionTest.InvalidWriteAddress:"\
+"KFDExceptionTest.AddressFault:"\
+"KFDExceptionTest.PermissionFault:"\
 "KFDQMTest.GPUDoorbellWrite"
 
 FILTER[raven]=\
@@ -199,8 +199,8 @@ FILTER[navi10]=\
 "KFDEvictTest.BurstyTest:"\
 "KFDEvictTest.QueueTest:"\
 "KFDPerfCountersTest.*:"\
-"KFDExceptionTest.InvalidBadAddress:"\
-"KFDExceptionTest.InvalidWriteAddress:"\
+"KFDExceptionTest.AddressFault:"\
+"KFDExceptionTest.PermissionFault:"\
 "KFDQMTest.GPUDoorbellWrite"
 
 FILTER[navi14]=\
diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDExceptionTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDExceptionTest.cpp
index 1a25e4cad4..6656317304 100644
--- a/projects/rocr-runtime/tests/kfdtest/src/KFDExceptionTest.cpp
+++ b/projects/rocr-runtime/tests/kfdtest/src/KFDExceptionTest.cpp
@@ -114,7 +114,7 @@ queuefail:
 }
 
 /* Test Bad Address access in a child process */
-TEST_F(KFDExceptionTest, InvalidBadAddress) {
+TEST_F(KFDExceptionTest, AddressFault) {
     TEST_REQUIRE_ENV_CAPABILITIES(ENVCAPS_64BITLINUX);
     TEST_START(TESTPROFILE_RUNALL);
 
@@ -158,7 +158,7 @@ TEST_F(KFDExceptionTest, InvalidBadAddress) {
 /* Allocate Read Only buffer. Test Memory Exception failure by
  * attempting to write to that buffer in the child process.
  */
-TEST_F(KFDExceptionTest, InvalidWriteAddress) {
+TEST_F(KFDExceptionTest, PermissionFault) {
     TEST_REQUIRE_ENV_CAPABILITIES(ENVCAPS_64BITLINUX);
     TEST_START(TESTPROFILE_RUNALL)