diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt
index df7704cfb8..193c073c9f 100644
--- a/shared/source/built_ins/kernels/CMakeLists.txt
+++ b/shared/source/built_ins/kernels/CMakeLists.txt
@@ -127,10 +127,9 @@ function(generate_cpp_spirv builtin)
 
   set(OUTPUT_LIST_SPV_FILES ${OUTPUT_LIST_SPV_FILES} ${OUTPUT_FILES_FOR_SPV} PARENT_SCOPE)
   set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE)
-  string(TOLOWER ${DEFAULT_SUPPORTED_PLATFORM} DEF_PLATFORM)
   add_custom_command(
                      OUTPUT ${GENERATED_SPV_INPUT}
-                     COMMAND ${cloc_cmd_prefix} -q -spv_only -file ${INPUT_FILENAME} -device ${DEF_PLATFORM} -out_dir ${OUTPUTDIR} -output_no_suffix -options "-cl-kernel-arg-info"
+                     COMMAND ${cloc_cmd_prefix} -q -spv_only -file ${INPUT_FILENAME} -out_dir ${OUTPUTDIR} -output_no_suffix -options "-cl-kernel-arg-info"
                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                      DEPENDS ${INPUT_FILENAME} ocloc copy_compiler_files
   )
diff --git a/shared/test/unit_test/test_macros/test_checks_shared.h b/shared/test/unit_test/test_macros/test_checks_shared.h
index 7d6b1faef3..20c594e443 100644
--- a/shared/test/unit_test/test_macros/test_checks_shared.h
+++ b/shared/test/unit_test/test_macros/test_checks_shared.h
@@ -26,6 +26,11 @@ bool supportsSvm(const Device *pDevice);
 
 } // namespace NEO
 
+#define REQUIRE_32BIT_OR_SKIP()               \
+    if (NEO::TestChecks::is64Bit() == true) { \
+        GTEST_SKIP();                         \
+    }
+
 #define REQUIRE_64BIT_OR_SKIP()                \
     if (NEO::TestChecks::is64Bit() == false) { \
         GTEST_SKIP();                          \