diff --git a/tests/amd_smi_test/amdsmitst.exclude b/tests/amd_smi_test/amdsmitst.exclude
index f498de400f..5a49f0dc0a 100644
--- a/tests/amd_smi_test/amdsmitst.exclude
+++ b/tests/amd_smi_test/amdsmitst.exclude
@@ -14,12 +14,13 @@ PERMANENT_BLACKLIST_ALL_ASICS=
 # is failing consistently
 TEMPORARY_BLACKLIST_ALL_ASICS=
 
-if [ -z $PERMANENT_BLACKLIST_ALL_ASICS -a -z $TEMPORARY_BLACKLIST_ALL_ASICS ]; then
+
+if [ -z "$PERMANENT_BLACKLIST_ALL_ASICS" -a -z "$TEMPORARY_BLACKLIST_ALL_ASICS" ]; then
   BLACKLIST_ALL_ASICS=
 else
   BLACKLIST_ALL_ASICS=\
-    "$PERMANENT_BLACKLIST_ALL_ASICS:"\
-    "$TEMPORARY_BLACKLIST_ALL_ASICS"
+"$PERMANENT_BLACKLIST_ALL_ASICS:"\
+"$TEMPORARY_BLACKLIST_ALL_ASICS:"
 fi
 
 # Device specific blacklists
@@ -55,6 +56,18 @@ FILTER[sienna_cichlid]=\
 $BLACKLIST_ALL_ASICS\
 "amdsmitstReadWrite.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\
+"amdsmitstReadOnly.TestVoltCurvRead"
+FILTER[90401]=${FILTER[90400]}
+FILTER[90402]=${FILTER[90400]}
+
 # SWDEV-321166
 FILTER[virtualization]=\
 $BLACKLIST_ALL_ASICS\
@@ -63,4 +76,4 @@ $BLACKLIST_ALL_ASICS\
 "amdsmitstReadWrite.FanReadWrite:"\
 "amdsmitstReadWrite.TestOverdriveReadWrite:"\
 "amdsmitstReadWrite.TestPowerReadWrite:"\
-"amdsmitstReadWrite.TestPowerCapReadWrite"
\ No newline at end of file
+"amdsmitstReadWrite.TestPowerCapReadWrite"