diff --git a/plugin/file/file.cpp b/plugin/file/file.cpp
index 3b0353d0df..5c6860ee32 100644
--- a/plugin/file/file.cpp
+++ b/plugin/file/file.cpp
@@ -316,8 +316,11 @@ class file_plugin_t {
 
           output_file = get_output_file(ACTIVITY_DOMAIN_HIP_OPS);
           ss << std::dec << begin->begin_ns << ":" << begin->end_ns << " " << begin->device_id
-             << ":" << begin->queue_id << " " << name << ":" << begin->correlation_id << ":"
-             << GetPid() << "\n";
+             << ":" << begin->queue_id << " "
+             << ((begin->op == HIP_OP_ID_DISPATCH && begin->kernel_name != nullptr)
+                     ? cxx_demangle(begin->kernel_name)
+                     : name)
+             << ":" << begin->correlation_id << ":" << GetPid() << "\n";
           *output_file << ss.str();
           break;
         }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 93f75fbed3..95563d5b9f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -29,6 +29,9 @@ set(CMAKE_EXECUTABLE_RPATH_LINK_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_F
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ROCM_PATH}/lib/cmake/hip")
 set(CMAKE_HIP_ARCHITECTURES OFF)
+if(DEFINED ROCM_PATH)
+    set(HIP_ROOT_DIR "${ROCM_PATH}/bin")
+endif()
 find_package(HIP REQUIRED MODULE)
 
 find_package(Clang REQUIRED CONFIG