diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 40b29ebc..7d7f6103 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -658,7 +658,8 @@ jobs:
         if [[ "${{matrix.GEN}}" == "Ninja Multi-Config" && ! `which ninja` ]]; then brew install ninja; fi &&
         # We need to provide an OpenCL driver for Intel CPU on mac
         brew install pocl
-        echo "OCL_ICD_VENDORS=/opt/homebrew/Cellar/pocl/6.0/etc/OpenCL/vendors" >> $GITHUB_ENV
+        POCL_INSTALL_PATH=$(brew --prefix pocl)
+        echo "OCL_ICD_VENDORS=$POCL_INSTALL_PATH/etc/OpenCL/vendors" >> $GITHUB_ENV
         cmake --version
 
     - name: Install dependencies (Homebrew)
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 28bbe937..0834853a 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -130,18 +130,17 @@ macro(add_sample)
     )
 
     foreach(CONFIG ${OPENCL_SAMPLE_CONFIGS})
-        install(TARGETS ${OPENCL_SAMPLE_TARGET} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR}/${CONFIG})
-        install(FILES ${OPENCL_SAMPLE_KERNELS} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR}/${CONFIG})
-        install(FILES ${OPENCL_SAMPLE_SHADERS} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR}/${CONFIG})
-        if(OPENCL_SDK_TEST_SAMPLES AND OPENCL_SAMPLE_TEST)
-            add_test(
-              NAME "${OPENCL_SAMPLE_TARGET}_${CONFIG}"
-              COMMAND ${OPENCL_SAMPLE_TARGET}
-              CONFIGURATIONS ${CONFIG}
-              WORKING_DIRECTORY "$<TARGET_FILE_DIR:${OPENCL_SAMPLE_TARGET}>"
-            )
-        endif()
+        install(TARGETS ${OPENCL_SAMPLE_TARGET} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR})
+        install(FILES ${OPENCL_SAMPLE_KERNELS} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR})
+        install(FILES ${OPENCL_SAMPLE_SHADERS} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR})
     endforeach()
+    if(OPENCL_SDK_TEST_SAMPLES AND OPENCL_SAMPLE_TEST)
+        add_test(
+          NAME ${OPENCL_SAMPLE_TARGET}
+          COMMAND ${OPENCL_SAMPLE_TARGET}
+          WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+        )
+    endif()
 endmacro()