diff --git a/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt b/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt
index a2b122d42b..55fb4c8c51 100644
--- a/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt
+++ b/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt
@@ -166,7 +166,6 @@ set (SRC_FILES gtest-1.6.0/gtest-all.cpp
   src/KFDExceptionTest.cpp
   src/KFDGraphicsInterop.cpp
   src/KFDPerfCounters.cpp
-  src/KFDDBGTest.cpp
   src/KFDGWSTest.cpp
   src/KFDIPCTest.cpp
   src/KFDASMTest.cpp
diff --git a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
index f48049cbfd..7148c552a4 100644
--- a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
+++ b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
@@ -69,7 +69,6 @@ TEMPORARY_BLACKLIST_ALL_ASICS=\
 "KFDQMTest.mGPUShareBO:"\
 "KFDQMTest.SdmaEventInterrupt:"\
 "KFDMemoryTest.CacheInvalidateOnRemoteWrite:"\
-"KFDDBGTest.BasicDebuggerSuspendResume:"\
 "KFDEvictTest.BurstyTest:"\
 "KFDHWSTest.*:"\
 "KFDSVMRangeTest.ReadOnlyRangeTest"
@@ -106,6 +105,15 @@ KV_QUEUE_BLACKLIST=\
 "KFDQMTest.Atomics:"\
 "KFDQMTest.GPUDoorbellWrite"
 
+BLACKLIST_GFX10=\
+"KFDMemoryTest.DeviceHdpFlush:"\
+"KFDSVMEvictTest.*"
+
+BLACKLIST_GFX10_NV2X=\
+"$BLACKLIST_GFX10:"\
+"KFDQMTest.BasicCuMaskingEven:"\
+"KFDPerfCountersTest.*"
+
 # KFDQMTest.CpuWriteCoherence fails. 0 dwordsAvailable (KFD-338)
 # KFDMemoryTest.MemoryRegister fails on SDMA queue creation (KFD-337)
 FILTER[kaveri]=\
@@ -226,8 +234,8 @@ FILTER[aldebaran]=\
 
 FILTER[navi10]=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDMemoryTest.MMBench:"\
-"KFDSVMEvictTest.*"
+"$BLACKLIST_GFX10:"\
+"KFDMemoryTest.MMBench"
 
 # Need to verify the following failed tests on another machine:
 # Exceptions not being received during exception tests
@@ -235,50 +243,31 @@ FILTER[navi10]=\
 # P2PBandwidth failing (wait times out) on node-to-multiple-nodes by [push, NONE]
 FILTER[navi12]=\
 "$BLACKLIST_ALL_ASICS:"\
+"$BLACKLIST_GFX10:"\
 "KFDExceptionTest.*:"\
 "KFDPerfCountersTest.*:"\
-"KFDPerformanceTest.P2PBandWidthTest:"\
-"KFDSVMEvictTest.*"
+"KFDPerformanceTest.P2PBandWidthTest"
 
 FILTER[navi14]=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDSVMEvictTest.*"
+"$BLACKLIST_GFX10"
 
 FILTER[sienna_cichlid]=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDQMTest.BasicCuMaskingEven:"\
-"KFDMemoryTest.DeviceHdpFlush:"\
-"KFDDBGTest.*:"\
-"KFDPerfCountersTest.*:"\
-"KFDSVMEvictTest.*"
+"$BLACKLIST_GFX10_NV2X"
 
 FILTER[navy_flounder]=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDQMTest.BasicCuMaskingEven:"\
-"KFDMemoryTest.DeviceHdpFlush:"\
-"KFDDBGTest.*:"\
-"KFDPerfCountersTest.*:"\
-"KFDSVMEvictTest.*"
+"$BLACKLIST_GFX10_NV2X"
 
 FILTER[dimgrey_cavefish]=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDQMTest.BasicCuMaskingEven:"\
-"KFDMemoryTest.DeviceHdpFlush:"\
-"KFDDBGTest.*:"\
-"KFDPerfCountersTest.*:"\
-"KFDSVMEvictTest.*"
+"$BLACKLIST_GFX10_NV2X"
 
 FILTER[beige_goby]=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDQMTest.BasicCuMaskingEven:"\
-"KFDMemoryTest.DeviceHdpFlush:"\
-"KFDDBGTest.*:"\
-"KFDPerfCountersTest.*:"\
-"KFDSVMEvictTest.*"
+"$BLACKLIST_GFX10_NV2X"
 
 FILTER[yellow_carp]=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDQMTest.BasicCuMaskingEven:"\
-"KFDMemoryTest.DeviceHdpFlush:"\
-"KFDIPCTest.CMABasicTest:"\
-"KFDSVMEvictTest.*"
+"$BLACKLIST_GFX10_NV2X"