diff --git a/CMakeLists.txt b/CMakeLists.txt
index 416702f34c..fd27dffafd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,7 @@ if(NOT ROCM_DEP_ROCMCORE)
   string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS ${CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS})
 endif()
 
-set(CPACK_COMPONENTS_ALL runtime tests)
+set(CPACK_COMPONENTS_ALL runtime)
 
 include(CPack)
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ec649194d4..65d1fbdd4a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -83,7 +83,7 @@ add_dependencies(mytest codeobj_test)
 ## Build the hsa (standalone) copy test
 function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE)
   separate_arguments(CLANG_ARG_LIST UNIX_COMMAND
-    "-O2 -x cl -Xclang -finclude-default-header -cl-denorms-are-zero -cl-std=CL2.0
+    "-O2 -x cl -Xclang -finclude-default-header -cl-denorms-are-zero -cl-std=CL2.0 -Wl,--build-id=sha1
     -target amdgcn-amd-amdhsa -mcpu=${TARGET_ID} -o ${OUTPUT_FILE} ${INPUT_FILE}")
   add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/${OUTPUT_FILE}
     COMMAND clang ${CLANG_ARG_LIST}