diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3be85fc399..8f04bce451 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,7 +33,7 @@ set ( RUN_SCRIPT "${TEST_DIR}/run.sh" )
 add_custom_target( mytest
   COMMAND make -C "${TEST_DIR}/MatrixTranspose"
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test"
-  COMMAND HIP_VDI=${HIP_VDI} make -C "${TEST_DIR}/MatrixTranspose_test"
+  COMMAND HIP_VDI=${HIP_VDI} KFD_WRAPPER=${KFD_WRAPPER} make -C "${TEST_DIR}/MatrixTranspose_test"
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose_test/MatrixTranspose ${PROJECT_BINARY_DIR}/test/MatrixTranspose_test"
 )
 
diff --git a/test/MatrixTranspose_test/MatrixTranspose.cpp b/test/MatrixTranspose_test/MatrixTranspose.cpp
index e4eb690802..34007cf20f 100644
--- a/test/MatrixTranspose_test/MatrixTranspose.cpp
+++ b/test/MatrixTranspose_test/MatrixTranspose.cpp
@@ -32,7 +32,9 @@ THE SOFTWARE.
 #include <inc/roctx.h>
 
 // kfd header file
+#ifdef KFD_WRAPPER
 #include <inc/roctracer_kfd.h>
+#endif
 
 #ifndef ITERATIONS
 # define ITERATIONS 101
@@ -206,6 +208,7 @@ void api_callback(
     fprintf(stdout, "ROCTX: \"%s\"\n", data->args.message);
     return;
   }
+#ifdef KFD_WRAPPER
   if (domain == ACTIVITY_DOMAIN_KFD_API) {
     const kfd_api_data_t* data = reinterpret_cast<const kfd_api_data_t*>(callback_data);
     fprintf(stdout, "KFD: <%s id(%u)\tcorrelation_id(%lu) %s> \n",
@@ -215,7 +218,7 @@ void api_callback(
         (data->phase == ACTIVITY_API_PHASE_ENTER) ? "on-enter" : "on-exit");
     return;
   }
-
+#endif
   const hip_api_data_t* data = reinterpret_cast<const hip_api_data_t*>(callback_data);
   fprintf(stdout, "<%s id(%u)\tcorrelation_id(%lu) %s> ",
     roctracer_op_string(ACTIVITY_DOMAIN_HIP_API, cid, 0),