diff --git a/CMakeLists.txt b/CMakeLists.txt
index cca655222c..baa1c1c1e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,13 +113,17 @@ add_subdirectory ( ${TEST_DIR} ${PROJECT_BINARY_DIR}/test )
 ## Installation and packaging
 set ( DEST_NAME ${ROCPROFILER_NAME} )
 if ( DEFINED CPACK_PACKAGING_INSTALL_PREFIX )
-  get_filename_component ( DEST_NAME ${CPACK_PACKAGING_INSTALL_PREFIX} NAME )
-  get_filename_component ( DEST_DIR ${CPACK_PACKAGING_INSTALL_PREFIX} DIRECTORY )
-  set ( CPACK_PACKAGING_INSTALL_PREFIX ${DEST_DIR} )
+  get_filename_component ( pkg_name ${CPACK_PACKAGING_INSTALL_PREFIX} NAME )
+  get_filename_component ( pkg_dir ${CPACK_PACKAGING_INSTALL_PREFIX} DIRECTORY )
+  if ( pkg_name STREQUAL ${DEST_NAME} )
+    set ( CPACK_PACKAGING_INSTALL_PREFIX ${pkg_dir} )
+  endif ()
+else ()
+  set ( CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} )
 endif ()
+message ( "CMake-install-prefix: ${CMAKE_INSTALL_PREFIX}" )
+message ( "CPack-install-prefix: ${CPACK_PACKAGING_INSTALL_PREFIX}" )
 message ( "-----------Dest-name: ${DEST_NAME}" )
-message ( "------Install-prefix: ${CMAKE_INSTALL_PREFIX}" )
-message ( "-----------CPACK-dir: ${CPACK_PACKAGING_INSTALL_PREFIX}" )
 
 ## Create symlinks for packaging and install
 add_custom_target ( rocprof-link ALL WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fcefbb3f34..42b6383819 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -103,4 +103,4 @@ add_custom_target( mbench
 )
 
 ## Copy OCL test
-execute_process ( COMMAND sh -xc "cp -r ${TEST_DIR}/ocl ${PROJECT_BINARY_DIR}/test" )
+execute_process ( COMMAND sh -xc "cp -r ${TEST_DIR}/ocl ${PROJECT_BINARY_DIR}/test/." )