diff --git a/libhsakmt/tests/kfdtest/src/KFDBaseComponentTest.cpp b/libhsakmt/tests/kfdtest/src/KFDBaseComponentTest.cpp
index 2234356f2e..aeec4d253e 100644
--- a/libhsakmt/tests/kfdtest/src/KFDBaseComponentTest.cpp
+++ b/libhsakmt/tests/kfdtest/src/KFDBaseComponentTest.cpp
@@ -166,6 +166,7 @@ void KFDBaseComponentTest::TearDown() {
 
     closelog();
 
+    m_NodeInfo.Delete();
     ROUTINE_END
 }
 
diff --git a/libhsakmt/tests/kfdtest/src/KFDTestUtil.cpp b/libhsakmt/tests/kfdtest/src/KFDTestUtil.cpp
index 46881040ae..bebac15860 100644
--- a/libhsakmt/tests/kfdtest/src/KFDTestUtil.cpp
+++ b/libhsakmt/tests/kfdtest/src/KFDTestUtil.cpp
@@ -609,13 +609,19 @@ bool HsaNodeInfo::Init(int NumOfNodes) {
     return ret;
 }
 
-HsaNodeInfo::~HsaNodeInfo() {
+void HsaNodeInfo::Delete() {
     const HsaNodeProperties *nodeProperties;
 
     for (unsigned int i = 0; i < m_HsaNodeProps.size(); i++)
         delete m_HsaNodeProps.at(i);
 
     m_HsaNodeProps.clear();
+    m_NodesWithGPU.clear();
+    m_NodesWithoutGPU.clear();
+}
+
+HsaNodeInfo::~HsaNodeInfo() {
+    Delete();
 }
 
 const std::vector<int>& HsaNodeInfo::GetNodesWithGPU() const {
diff --git a/libhsakmt/tests/kfdtest/src/KFDTestUtil.hpp b/libhsakmt/tests/kfdtest/src/KFDTestUtil.hpp
index 7565e1b307..3e8cc8c9af 100644
--- a/libhsakmt/tests/kfdtest/src/KFDTestUtil.hpp
+++ b/libhsakmt/tests/kfdtest/src/KFDTestUtil.hpp
@@ -216,6 +216,7 @@ class HsaNodeInfo {
     ~HsaNodeInfo();
 
     bool Init(int NumOfNodes);
+    void Delete();
 
     /* This function should be deprecated soon. This for transistion purpose only
      * Currently, KfdTest is designed to test only ONE node. This function acts