diff --git a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
index b1eb8c8b78..6a442954c9 100644
--- a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
+++ b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
@@ -242,13 +242,6 @@ FILTER[aldebaran]=\
 "KFDMemoryTest.PtraceAccess:"\
 "KFDMemoryTest.DeviceHdpFlush"
 
-FILTER[aqua_vanjaram]=\
-"$BLACKLIST_ALL_ASICS:"\
-"KFDMemoryTest.LargestSysBufferTest:"\
-"KFDMemoryTest.BigSysBufferStressTest:"\
-"KFDMemoryTest.FlatScratchAccess:"\
-"KFDIPCTest.BasicTest"
-
 FILTER[navi10]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$BLACKLIST_GFX10:"\
@@ -310,3 +303,24 @@ FILTER[gfx1103]=\
 FILTER[gfx1036]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$BLACKLIST_GFX10_NV2X"
+
+FILTER[gfx940]=\
+"$BLACKLIST_ALL_ASICS:"\
+"KFDMemoryTest.LargestSysBufferTest:"\
+"KFDMemoryTest.BigSysBufferStressTest:"\
+"KFDMemoryTest.FlatScratchAccess:"\
+"KFDIPCTest.BasicTest"
+
+FILTER[gfx941]=\
+"$BLACKLIST_ALL_ASICS:"\
+"KFDMemoryTest.LargestSysBufferTest:"\
+"KFDMemoryTest.BigSysBufferStressTest:"\
+"KFDMemoryTest.FlatScratchAccess:"\
+"KFDIPCTest.BasicTest"
+
+FILTER[gfx942]=\
+"$BLACKLIST_ALL_ASICS:"\
+"KFDMemoryTest.LargestSysBufferTest:"\
+"KFDMemoryTest.BigSysBufferStressTest:"\
+"KFDMemoryTest.FlatScratchAccess:"\
+"KFDIPCTest.BasicTest"
\ No newline at end of file
diff --git a/projects/rocr-runtime/tests/kfdtest/scripts/run_kfdtest.sh b/projects/rocr-runtime/tests/kfdtest/scripts/run_kfdtest.sh
index f84ed0e760..fe60fdb8c2 100755
--- a/projects/rocr-runtime/tests/kfdtest/scripts/run_kfdtest.sh
+++ b/projects/rocr-runtime/tests/kfdtest/scripts/run_kfdtest.sh
@@ -161,6 +161,9 @@ getNodeName() {
           gpuName="gfx$(echo "$HSA_OVERRIDE_GFX_VERSION" | awk 'BEGIN {FS="."; RS=""} {printf "%d%x%x", $1, $2, $3 }')"
       else
           local GfxVersionDec=$(cat $TOPOLOGY_SYSFS_DIR/$nodeId/properties | grep gfx_target_version | awk '{print $2}')
+          if [[ ${#GfxVersionDec} = 5 ]]; then
+              GfxVersionDec="0${GfxVersionDec}"
+          fi
           gpuName="gfx$(printf "$GfxVersionDec" | fold -w2 | awk 'BEGIN {FS="\n"; RS=""} {printf "%d%x%x", $1, $2, $3}')"
       fi
     fi