diff --git a/unit_tests/api/CMakeLists.txt b/unit_tests/api/CMakeLists.txt
index 5f35ffcae5..58855f409d 100644
--- a/unit_tests/api/CMakeLists.txt
+++ b/unit_tests/api/CMakeLists.txt
@@ -16,10 +16,10 @@ set(IGDRCL_SRCS_tests_api
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_compile_program_tests.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_buffer_tests.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_with_properties_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_with_properties_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_context_from_type_tests.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_context_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_image_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_kernel_tests.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_kernels_in_program_tests.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_perf_counters_command_queue_tests.inl
diff --git a/unit_tests/api/api_tests_wrapper1.cpp b/unit_tests/api/api_tests_wrapper1.cpp
index adf269efbf..6d16b34fa3 100644
--- a/unit_tests/api/api_tests_wrapper1.cpp
+++ b/unit_tests/api/api_tests_wrapper1.cpp
@@ -10,10 +10,8 @@
 #include "unit_tests/api/cl_compile_program_tests.inl"
 #include "unit_tests/api/cl_create_buffer_tests.inl"
 #include "unit_tests/api/cl_create_command_queue_tests.inl"
-#include "unit_tests/api/cl_create_command_queue_with_properties_tests.inl"
 #include "unit_tests/api/cl_create_context_from_type_tests.inl"
 #include "unit_tests/api/cl_create_context_tests.inl"
-#include "unit_tests/api/cl_create_image_tests.inl"
 #include "unit_tests/api/cl_create_kernel_tests.inl"
 #include "unit_tests/api/cl_create_kernels_in_program_tests.inl"
 #include "unit_tests/api/cl_create_perf_counters_command_queue_tests.inl"
diff --git a/unit_tests/api/cl_create_command_queue_with_properties_tests.inl b/unit_tests/api/cl_create_command_queue_with_properties_tests.cpp
similarity index 100%
rename from unit_tests/api/cl_create_command_queue_with_properties_tests.inl
rename to unit_tests/api/cl_create_command_queue_with_properties_tests.cpp
diff --git a/unit_tests/api/cl_create_image_tests.inl b/unit_tests/api/cl_create_image_tests.cpp
similarity index 100%
rename from unit_tests/api/cl_create_image_tests.inl
rename to unit_tests/api/cl_create_image_tests.cpp