diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt
index d2097ca52d..e808810c96 100644
--- a/opencl/test/unit_test/CMakeLists.txt
+++ b/opencl/test/unit_test/CMakeLists.txt
@@ -456,7 +456,9 @@ macro(macro_for_each_core_type)
 
         foreach(file ${TEST_KERNEL_BINDLESS} ${BINDLESS_KERNELS_IMAGES})
           foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
-            neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${file} "bindless" ${TEST_KERNEL_BINDLESS_internal_options})
+            if(NOT ("${CORE_TYPE_LOWER}" STREQUAL "gen8"))
+              neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${file} "bindless" ${TEST_KERNEL_BINDLESS_internal_options})
+            endif()
           endforeach()
         endforeach()
 
diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt
index 1ae29eae72..c48ae2d946 100644
--- a/shared/source/built_ins/kernels/CMakeLists.txt
+++ b/shared/source/built_ins/kernels/CMakeLists.txt
@@ -19,21 +19,10 @@ set(BUILTIN_OPTIONS_STATELESS
     "-cl-intel-greater-than-4GB-buffer-required"
 )
 
-set(bindless_OPTIONS
-    -internal_options "-cl-intel-use-bindless-mode -cl-intel-use-bindless-advanced-mode"
-)
-
-set(bindful_OPTIONS
-    ""
-)
-
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
   list(APPEND __ocloc__options__ "-D DEBUG")
 endif()
 
-set(BUILTINS_INCLUDE_DIR ${TargetDir} PARENT_SCOPE)
-set(BUILTIN_CPP "")
-
 function(get_bits_for_stateless core_type platform_type)
   # Force 32bits compiling on gen9lp for stateless builtins
   if((${core_type} STREQUAL "GEN9") AND (${platform_type} STREQUAL "LP"))