diff --git a/projects/rocm-smi-lib/tests/rocm_smi_test/rsmitst.exclude b/projects/rocm-smi-lib/tests/rocm_smi_test/rsmitst.exclude
index 7d229b68f4..43a738ab22 100644
--- a/projects/rocm-smi-lib/tests/rocm_smi_test/rsmitst.exclude
+++ b/projects/rocm-smi-lib/tests/rocm_smi_test/rsmitst.exclude
@@ -57,18 +57,19 @@ $BLACKLIST_ALL_ASICS\
 "rsmitstReadWrite.TestPerfLevelReadWrite"
 
 # SWDEV-391407
+# aqua_vanjaram and later systems show 'ip discovery' in
+# /sys/class/kfd/kfd/topology/nodes/*/name
+#
+# For those systems gfx_target_version must be used. It can be found in
+# /sys/class/kfd/kfd/topology/nodes/*/properties
 FILTER[90400]=\
 $BLACKLIST_ALL_ASICS\
 "rsmitstReadOnly.TestVoltCurvRead:"\
 "rsmitstReadOnly.TestFrequenciesRead:"\
 "rsmitstReadWrite.TestFrequenciesReadWrite:"\
 "rsmitstReadWrite.TestPowerReadWrite"
-FILTER[90401]=\
-$BLACKLIST_ALL_ASICS\
-"rsmitstReadOnly.TestVoltCurvRead:"\
-"rsmitstReadOnly.TestFrequenciesRead:"\
-"rsmitstReadWrite.TestFrequenciesReadWrite:"\
-"rsmitstReadWrite.TestPowerReadWrite"
+FILTER[90401]=${FILTER[90400]}
+FILTER[90402]=${FILTER[90400]}
 
 # SWDEV-321166
 FILTER[virtualization]=\