diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDHWSTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDHWSTest.cpp
index 66c0b5d8ff..3040b16ac6 100644
--- a/projects/rocr-runtime/tests/kfdtest/src/KFDHWSTest.cpp
+++ b/projects/rocr-runtime/tests/kfdtest/src/KFDHWSTest.cpp
@@ -28,18 +28,12 @@ void KFDHWSTest::SetUp() {
 
     KFDBaseComponentTest::SetUp();
 
-    m_pIsaGen = IsaGenerator::Create(m_FamilyId);
-
     ROUTINE_END
 }
 
 void KFDHWSTest::TearDown() {
     ROUTINE_START
 
-    if (m_pIsaGen)
-        delete m_pIsaGen;
-    m_pIsaGen = NULL;
-
     KFDBaseComponentTest::TearDown();
 
     ROUTINE_END
@@ -70,7 +64,9 @@ void KFDHWSTest::RunTest(unsigned nProcesses, unsigned nQueues, unsigned nLoops)
 
     // Run work on all queues
     HsaMemoryBuffer isaBuffer(PAGE_SIZE, defaultGPUNode, true/*zero*/, false/*local*/, true/*exec*/);
-    m_pIsaGen->GetNoopIsa(isaBuffer);
+
+    ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(NoopIsa, isaBuffer.As<char*>()));
+
     for (l = 0; l < nLoops; l++) {
         for (q = 0; q < nQueues; q++) {
             if (dispatch[q])
diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDHWSTest.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDHWSTest.hpp
index e3ea5155c2..cbec52fbed 100644
--- a/projects/rocr-runtime/tests/kfdtest/src/KFDHWSTest.hpp
+++ b/projects/rocr-runtime/tests/kfdtest/src/KFDHWSTest.hpp
@@ -27,14 +27,12 @@
 #include <gtest/gtest.h>
 
 #include "PM4Queue.hpp"
-#include "IsaGenerator.hpp"
 #include "KFDMultiProcessTest.hpp"
 #include "Dispatch.hpp"
 
 class KFDHWSTest : public KFDMultiProcessTest {
  public:
-    KFDHWSTest():m_pIsaGen(NULL) {}
-
+    KFDHWSTest() {}
     ~KFDHWSTest() {}
 
  protected:
@@ -42,9 +40,6 @@ class KFDHWSTest : public KFDMultiProcessTest {
     virtual void TearDown();
 
     void RunTest(unsigned nProcesses, unsigned nQueues, unsigned nLoops);
-
- protected:  // Members
-    IsaGenerator* m_pIsaGen;
 };
 
 #endif  // __KFD_QCM_TEST__H__