diff --git a/tests/kfdtest/src/KFDTestUtil.cpp b/tests/kfdtest/src/KFDTestUtil.cpp
index f3e3c3fefa..f8b36c01f0 100644
--- a/tests/kfdtest/src/KFDTestUtil.cpp
+++ b/tests/kfdtest/src/KFDTestUtil.cpp
@@ -106,7 +106,7 @@ unsigned int FamilyIdFromNode(const HsaNodeProperties *props) {
         break;
     }
 
-    if (familyId == FAMILY_KV || familyId == FAMILY_CZ || familyId == FAMILY_RV)
+    if (props->NumCPUCores && props->NumFComputeCores)
         is_dgpu_dev = false;
     else
         is_dgpu_dev = true;