diff --git a/projects/roctracer/test/CMakeLists.txt b/projects/roctracer/test/CMakeLists.txt
index fd0ed9ca7f..b2f97faf7d 100644
--- a/projects/roctracer/test/CMakeLists.txt
+++ b/projects/roctracer/test/CMakeLists.txt
@@ -23,6 +23,9 @@
 cmake_minimum_required ( VERSION 2.8.12 )
 set ( CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL "Verbose Output" FORCE )
 
+# test run script
+set ( RUN_SCRIPT "${TEST_DIR}/run.sh" )
+
 ## Util sources
 file( GLOB UTIL_SRC "${TEST_HSA}/util/*.cpp" )
 
@@ -34,13 +37,12 @@ target_include_directories ( ${TEST_LIB} PRIVATE ${TEST_HSA} ${ROOT_DIR} ${HSA_R
 target_link_libraries ( ${TEST_LIB} ${ROCTRACER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt )
 
 # HSA test
-#set ( TEST_HSA "${TEST_DIR}/hsa/test" )
-#set ( TEST_DIR ${TEST_HSA} )
-#execute_process ( COMMAND sh -xc "if [ ! -e ${TEST_DIR}/hsa ] ; then git clone https://github.com/ROCmSoftwarePlatform/hsa-class.git ${TEST_DIR}/hsa; fi" )
-#execute_process ( COMMAND sh -xc "if [ -e ${TEST_DIR}/hsa ] ; then cd ${TEST_DIR}/hsa && git pull --rebase; fi" )
-#add_subdirectory ( ${TEST_DIR} ${PROJECT_BINARY_DIR}/test/hsa )
+set ( TEST_HSA "${TEST_DIR}/hsa/test" )
+execute_process ( COMMAND sh -xc "if [ ! -e ${TEST_DIR}/hsa ] ; then git clone https://github.com/ROCmSoftwarePlatform/hsa-class.git ${TEST_DIR}/hsa; fi" )
+execute_process ( COMMAND sh -xc "if [ -e ${TEST_DIR}/hsa ] ; then cd ${TEST_DIR}/hsa && git checkout 3e7a87f; fi" )
+set ( TEST_DIR ${TEST_HSA} )
+add_subdirectory ( ${TEST_DIR} ${PROJECT_BINARY_DIR}/test/hsa )
 
-# test run script
-set ( RUN_SCRIPT "${TEST_DIR}/run.sh" )
+# copying run script
 execute_process ( COMMAND sh -xc "cp ${RUN_SCRIPT} ${PROJECT_BINARY_DIR}" )
 
diff --git a/projects/roctracer/test/run.sh b/projects/roctracer/test/run.sh
index df1e1284db..ad6c52a138 100755
--- a/projects/roctracer/test/run.sh
+++ b/projects/roctracer/test/run.sh
@@ -45,7 +45,8 @@ export HSA_TOOLS_LIB="test/libtracer_tool.so libroctracer64.so"
 export LD_PRELOAD="$HSA_TOOLS_LIB"
 
 export ROCTRACER_DOMAIN="hsa"
-HCC_PROFILE=1 LD_PRELOAD=$HCC_HOME/lib/libmcwamp_hsa.so ./test/MatrixTranspose
+eval ./test/hsa/ctrl
+#HCC_PROFILE=1 LD_PRELOAD=$HCC_HOME/lib/libmcwamp_hsa.so ./test/MatrixTranspose
 
 #valgrind --leak-check=full $tbin
 #valgrind --tool=massif $tbin