diff --git a/projects/roctracer/build.sh b/projects/roctracer/build.sh
index 300a24ec5b..2b98eb2bc8 100755
--- a/projects/roctracer/build.sh
+++ b/projects/roctracer/build.sh
@@ -30,6 +30,7 @@ cmake \
 popd
 
 make $MAKE_OPTS
+make mytest
 make package
 
 exit 0
diff --git a/projects/roctracer/test/CMakeLists.txt b/projects/roctracer/test/CMakeLists.txt
index b618efc345..6a0dfddbb4 100644
--- a/projects/roctracer/test/CMakeLists.txt
+++ b/projects/roctracer/test/CMakeLists.txt
@@ -23,13 +23,17 @@
 cmake_minimum_required ( VERSION 2.8.12 )
 set ( CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL "Verbose Output" FORCE )
 
-## HIP test
-execute_process( COMMAND make -C "${TEST_DIR}/MatrixTranspose" )
-execute_process( COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test" )
-
 ## test run script
 set ( RUN_SCRIPT "${TEST_DIR}/run.sh" )
 
+## build HIP tests
+add_custom_target( mytest
+  COMMAND make -C "${TEST_DIR}/MatrixTranspose"
+  COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test"
+  COMMAND make -C "${TEST_DIR}/MatrixTranspose_test"
+  COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose_test/MatrixTranspose ${PROJECT_BINARY_DIR}/test/MatrixTranspose_test"
+)
+
 ## Util sources
 file( GLOB UTIL_SRC "${TEST_HSA}/util/*.cpp" )
 
@@ -49,4 +53,3 @@ add_subdirectory ( ${TEST_DIR} ${PROJECT_BINARY_DIR}/test/hsa )
 
 ## copying run script
 execute_process ( COMMAND sh -xc "cp ${RUN_SCRIPT} ${PROJECT_BINARY_DIR}" )
-
diff --git a/projects/roctracer/test/MatrixTranspose/Makefile b/projects/roctracer/test/MatrixTranspose/Makefile
index 0a51acca5e..abc56bd98a 100644
--- a/projects/roctracer/test/MatrixTranspose/Makefile
+++ b/projects/roctracer/test/MatrixTranspose/Makefile
@@ -1,25 +1,15 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
-HIPCC=$(HIP_PATH)/bin/hipcc
-
-TARGET=hcc
+HCC_HOME? = /opt/rocm/hcc
+HIP_PATH? = /opt/rocm/hip
 
 SOURCES = MatrixTranspose.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
-
 EXECUTABLE=./MatrixTranspose
 
-.PHONY: test
-
-
-all: $(EXECUTABLE) test
-
+HIPCC=$(HIP_PATH)/bin/hipcc
 CXXFLAGS =-g
 CXX=$(HIPCC)
 
+all: $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
 	$(HIPCC) $(OBJECTS) -o $@
@@ -34,3 +24,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(HIP_PATH)/src/*.o
 
+.PHONY: all test clean
diff --git a/projects/roctracer/test/MatrixTranspose_test/Makefile b/projects/roctracer/test/MatrixTranspose_test/Makefile
index 1c0022498f..9b8edf6e70 100644
--- a/projects/roctracer/test/MatrixTranspose_test/Makefile
+++ b/projects/roctracer/test/MatrixTranspose_test/Makefile
@@ -9,15 +9,16 @@ OBJECTS    = $(SOURCES:.cpp=.o)
 
 ITERATIONS ?= 100
 
-HIP_PATH ?= /opt/rocm/hip
-HIPCC     = $(HIP_PATH)/bin/hipcc
+HCC_HOME  ?= /opt/rocm/hcc
+HIP_PATH  ?= /opt/rocm/hip
 
-CXX=$(HIPCC)
-CXXFLAGS =-g -I$(ROOT_PATH) -I$(ROOT_PATH)/inc -DLOCAL_BUILD=1 -DITERATIONS=$(ITERATIONS)
+HIPCC     = $(HIP_PATH)/bin/hipcc
+CXX       = $(HIPCC)
+CXXFLAGS  = -g -I$(ROOT_PATH) -I$(ROOT_PATH)/inc -DLOCAL_BUILD=1 -DITERATIONS=$(ITERATIONS)
 
 export LD_LIBRARY_PATH=$(LIB_PATH)
 
-all: clean $(EXECUTABLE) test
+all: clean $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
 	$(HIPCC) $(OBJECTS) -o $@ $(HCC_LIBS) $(ROC_LIBS)
diff --git a/projects/roctracer/test/run.sh b/projects/roctracer/test/run.sh
index 148f0412fc..5fd166ecba 100755
--- a/projects/roctracer/test/run.sh
+++ b/projects/roctracer/test/run.sh
@@ -27,11 +27,11 @@ export HSA_TOOLS_REPORT_LOAD_FAILURE=1
 # paths to ROC profiler and oher libraries
 export LD_LIBRARY_PATH=$PWD
 
-#make -C ../test/MatrixTranspose_test
+# rocTrecer is used explicitely by test
+HCC_PROFILE=1 LD_PRELOAD=$HCC_HOME/lib/libmcwamp_hsa.so ./test/MatrixTranspose_test
 
-# ROC profiler library loaded by HSA runtime
+# rocTracer/tool is loaded by HSA runtime
 export HSA_TOOLS_LIB="test/libtracer_tool.so libroctracer64.so"
-
 HCC_PROFILE=1 LD_PRELOAD=$HCC_HOME/lib/libmcwamp_hsa.so ./test/MatrixTranspose
 
 # test trace