diff --git a/tests/kfdtest/src/KFDSVMRangeTest.cpp b/tests/kfdtest/src/KFDSVMRangeTest.cpp
index 6aad683f91..283a567ff4 100644
--- a/tests/kfdtest/src/KFDSVMRangeTest.cpp
+++ b/tests/kfdtest/src/KFDSVMRangeTest.cpp
@@ -34,8 +34,6 @@ void KFDSVMRangeTest::SetUp() {
 
     KFDBaseComponentTest::SetUp();
 
-    m_pIsaGen = IsaGenerator::Create(m_FamilyId);
-
     SVMSetXNACKMode();
 
     ROUTINE_END
@@ -44,10 +42,6 @@ void KFDSVMRangeTest::SetUp() {
 void KFDSVMRangeTest::TearDown() {
     ROUTINE_START
 
-    if (m_pIsaGen)
-        delete m_pIsaGen;
-    m_pIsaGen = NULL;
-
     SVMRestoreXNACKMode();
 
     KFDBaseComponentTest::TearDown();
@@ -80,7 +74,7 @@ TEST_F(KFDSVMRangeTest, BasicSystemMemTest) {
 
     srcSysBuffer.Fill(0x01010101);
 
-    m_pIsaGen->GetCopyDwordIsa(isaBuffer);
+    ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(CopyDwordIsa, isaBuffer.As<char*>()));
 
     ASSERT_SUCCESS(queue.Create(defaultGPUNode));
     queue.SetSkipWaitConsump(0);
@@ -364,7 +358,8 @@ TEST_F(KFDSVMRangeTest, EvictSystemRangeTest) {
     ASSERT_SUCCESS(sdmaQueue.Create(defaultGPUNode));
 
     HsaMemoryBuffer isaBuffer(PAGE_SIZE, defaultGPUNode, true/*zero*/, false/*local*/, true/*exec*/);
-    m_pIsaGen->GetCopyDwordIsa(isaBuffer);
+
+    ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(CopyDwordIsa, isaBuffer.As<char*>()));
 
     Dispatch dispatch0(isaBuffer);
     dispatch0.SetArgs(srcBuffer.As<void*>(), dstBuffer.As<void*>());
@@ -458,7 +453,8 @@ TEST_F(KFDSVMRangeTest, PartialUnmapSysMemTest) {
 
     munmap(pBuf2, Buf2Size);
 
-    m_pIsaGen->GetCopyDwordIsa(isaBuffer);
+    ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(CopyDwordIsa, isaBuffer.As<char*>()));
+
     ASSERT_SUCCESS(queue.Create(defaultGPUNode));
 
     Dispatch dispatch(isaBuffer);
@@ -507,7 +503,7 @@ TEST_F(KFDSVMRangeTest, BasicVramTest) {
 
     srcSysBuffer.Fill(0x01010101);
 
-    m_pIsaGen->GetCopyDwordIsa(isaBuffer);
+    ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(CopyDwordIsa, isaBuffer.As<char*>()));
 
     ASSERT_SUCCESS(queue.Create(defaultGPUNode));
     queue.SetSkipWaitConsump(0);
@@ -943,7 +939,9 @@ TEST_F(KFDSVMRangeTest, MigratePolicyTest) {
 #ifdef USE_PM4_QUEUE_TRIGGER_VM_FAULT
     HsaMemoryBuffer isaBuffer(PAGE_SIZE, defaultGPUNode);
     PM4Queue queue;
-    m_pIsaGen->GetCopyDwordIsa(isaBuffer);
+
+    ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(CopyDwordIsa, isaBuffer.As<char*>()));
+
     ASSERT_SUCCESS(queue.Create(defaultGPUNode));
 
     for (HSAuint64 i = 0; i < BufferSize / 8; i += 512) {
diff --git a/tests/kfdtest/src/KFDSVMRangeTest.hpp b/tests/kfdtest/src/KFDSVMRangeTest.hpp
index 88bddd94a8..03a245dba3 100644
--- a/tests/kfdtest/src/KFDSVMRangeTest.hpp
+++ b/tests/kfdtest/src/KFDSVMRangeTest.hpp
@@ -26,21 +26,17 @@
 
 #include <gtest/gtest.h>
 
-#include "IsaGenerator.hpp"
 #include "KFDBaseComponentTest.hpp"
 
 class KFDSVMRangeTest : public KFDBaseComponentTest {
  public:
-    KFDSVMRangeTest() :m_pIsaGen(NULL) {}
+    KFDSVMRangeTest() {}
     ~KFDSVMRangeTest() {}
     void SplitRangeTest(int defaultGPUNode, int prefetch_location);
 
  protected:
     virtual void SetUp();
     virtual void TearDown();
-
- protected:  // Members
-    IsaGenerator* m_pIsaGen;
 };
 
 #endif  // __KFD_LOCALMEMORY_TEST__H__