diff --git a/tests/kfdtest/src/KFDMemoryTest.cpp b/tests/kfdtest/src/KFDMemoryTest.cpp
index 5ee8537f37..082c2e60dc 100644
--- a/tests/kfdtest/src/KFDMemoryTest.cpp
+++ b/tests/kfdtest/src/KFDMemoryTest.cpp
@@ -177,7 +177,7 @@ TEST_F(KFDMemoryTest, MapUnmapToNodes) {
     HsaMemoryBuffer dstBuffer(PAGE_SIZE, defaultGPUNode);
 
     const char *pReadMemory;
-    if (m_NodeInfo.IsNodeXGMItoCPU(defaultGPUNode))
+    if (m_NodeInfo.IsNodeXGMItoCPU(defaultGPUNode) && (m_FamilyId != FAMILY_AL))
         /* On A+A system memory is mapped as NC */
         pReadMemory = PollNCMemoryIsa;
     else
diff --git a/tests/kfdtest/src/ShaderStore.cpp b/tests/kfdtest/src/ShaderStore.cpp
index fc97d6490e..c676502a85 100644
--- a/tests/kfdtest/src/ShaderStore.cpp
+++ b/tests/kfdtest/src/ShaderStore.cpp
@@ -189,10 +189,6 @@ const char *PollMemoryIsa = R"(
  * polled can be Non-coherant memory. SCC system-level
  * cache coherence is not supported in scalar (smem) path.
  * Use vmem operations with scc
- *
- * Note: Only works on Aldebaran, and even then the scc modifier
- *       has been defeatured. This shader is more or less
- *       deprecated.
  */
 const char *PollNCMemoryIsa = R"(
         .text