diff --git a/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp b/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp
index e6cb080589..7f84685838 100644
--- a/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp
+++ b/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp
@@ -314,13 +314,15 @@ TEST_F(KFDEvictTest, BasicTest) {
     HSAuint64 vramSize = GetVramSize(defaultGPUNode);
     HSAuint64 sysMemSize = GetSysMemSize();
 
+    const HsaNodeProperties *pNodeProperties = m_NodeInfo.HsaDefaultGPUNodeProperties();
+
     if (!vramSize) {
         LOG() << "Skipping test: No VRAM found." << std::endl;
         return;
     }
 
-    if (m_NodeInfo.IsAppAPU(defaultGPUNode)) {
-        LOG() << "Skipping test on AppAPU." << std::endl;
+    if (pNodeProperties->Integrated) {
+        LOG() << "Skipping test on APU." << std::endl;
         return;
     }
 
@@ -398,8 +400,8 @@ TEST_F(KFDEvictTest, QueueTest) {
         return;
     }
 
-    if (m_NodeInfo.IsAppAPU(defaultGPUNode)) {
-        LOG() << "Skipping test on AppAPU." << std::endl;
+    if (pNodeProperties->Integrated) {
+        LOG() << "Skipping test on APU." << std::endl;
         return;
     }
 
@@ -519,8 +521,10 @@ TEST_F(KFDEvictTest, BurstyTest) {
     ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
     HSAuint64 vramBufSize = ALLOCATE_BUF_SIZE_MB * 1024 * 1024;
 
-    if (m_NodeInfo.IsAppAPU(defaultGPUNode)) {
-        LOG() << "Skipping test on AppAPU." << std::endl;
+    const HsaNodeProperties *pNodeProperties = m_NodeInfo.HsaDefaultGPUNodeProperties();
+
+    if (pNodeProperties->Integrated) {
+        LOG() << "Skipping test on APU." << std::endl;
         return;
     }
 
diff --git a/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp b/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
index 8175c6a0b0..63c667f070 100644
--- a/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
+++ b/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
@@ -240,8 +240,10 @@ TEST_P(KFDSVMEvictTest, BasicTest) {
     ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
     HSAuint64 vramBufSize = ALLOCATE_BUF_SIZE_MB * 1024 * 1024;
 
-    if (m_NodeInfo.IsAppAPU(defaultGPUNode)) {
-        LOG() << "Skipping test on AppAPU." << std::endl;
+    const HsaNodeProperties *pNodeProperties = m_NodeInfo.HsaDefaultGPUNodeProperties();
+
+    if (pNodeProperties->Integrated) {
+        LOG() << "Skipping test on APU." << std::endl;
         return;
     }
 
@@ -313,8 +315,8 @@ TEST_P(KFDSVMEvictTest, QueueTest) {
         return;
     }
 
-    if (m_NodeInfo.IsAppAPU(defaultGPUNode)) {
-        LOG() << "Skipping test on AppAPU." << std::endl;
+    if (pNodeProperties->Integrated) {
+        LOG() << "Skipping test on APU." << std::endl;
         return;
     }
 
diff --git a/libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.cpp b/libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.cpp
index b38eb700bc..fd6d2a7f25 100644
--- a/libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.cpp
+++ b/libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.cpp
@@ -1461,13 +1461,15 @@ TEST_P(KFDSVMRangeTest, HMMProfilingEvent) {
     int defaultGPUNode = m_NodeInfo.HsaDefaultGPUNode();
     ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
 
-    if (!GetVramSize(defaultGPUNode)) {
-        LOG() << "Skipping test: No VRAM found." << std::endl;
+    const HsaNodeProperties *pNodeProperties = m_NodeInfo.HsaDefaultGPUNodeProperties();
+
+    if (pNodeProperties->Integrated) {
+        LOG() << "Skipping test on APU." << std::endl;
         return;
     }
 
-    if (m_NodeInfo.IsAppAPU(defaultGPUNode)) {
-        LOG() << "Skipping test on AppAPU." << std::endl;
+    if (!GetVramSize(defaultGPUNode)) {
+        LOG() << "Skipping test: No VRAM found." << std::endl;
         return;
     }