diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt
index e3782ffc3d..0dfe47e730 100644
--- a/projects/clr/opencl/CMakeLists.txt
+++ b/projects/clr/opencl/CMakeLists.txt
@@ -9,7 +9,7 @@ project(opencl)
 
 include(GNUInstallDirs)
 
-option(BUILD_TESTS "Enable building OpenCL tests" ON)
+option(BUILD_TESTS "Enable building OpenCL tests" OFF)
 
 set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
 add_subdirectory(khronos/icd)
diff --git a/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt
index 122c0fddcb..5b1959488a 100644
--- a/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_executable(ocltst
+add_executable(ocltst)
+
+target_sources(ocltst PRIVATE
     ${OCLTST_DIR}/env/oclsysinfo.cpp
     ${OCLTST_DIR}/env/ocltst.cpp
     ${OCLTST_DIR}/env/pfm.cpp
@@ -8,12 +10,20 @@ add_executable(ocltst
     ${OCLTST_DIR}/module/common/OCLThread.cpp
     ${OCLTST_DIR}/module/common/OCLWrapper.cpp)
 
+# Windows compatibilty logic
+if (WIN32)
+    target_sources(ocltst PRIVATE
+        ${OCLTST_DIR}/env/getopt.cpp
+        ${OCLTST_DIR}/env/ServiceCode.cpp
+        ${OCLTST_DIR}/env/window.cpp)
+endif()
+
+
 set_target_properties(ocltst PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS OFF
-    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
-    EXCLUDE_FROM_ALL TRUE)
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst)
 
 target_compile_definitions(ocltst
     PRIVATE
@@ -27,3 +37,6 @@ target_link_libraries(ocltst
     PRIVATE
         OpenCL
         TestLog)
+
+INSTALL(TARGETS ocltst DESTINATION tests/ocltst)
+
diff --git a/projects/clr/opencl/tests/ocltst/log/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/log/CMakeLists.txt
index d33d6f069f..d5f58d9350 100644
--- a/projects/clr/opencl/tests/ocltst/log/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/log/CMakeLists.txt
@@ -5,11 +5,17 @@ set_target_properties(TestLog PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS OFF
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
-    EXCLUDE_FROM_ALL TRUE)
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst)
+
+target_compile_definitions(TestLog PRIVATE
+    OCLTST_LOG_BUILD)
 
 target_include_directories(TestLog
     PRIVATE
         ${OCLTST_DIR}/include
     PUBLIC
         ${OCLTST_DIR}/log)
+
+INSTALL(TARGETS TestLog DESTINATION tests/ocltst)
+
diff --git a/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
index efe7f3ff2f..592f7a6d6d 100644
--- a/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
@@ -23,8 +23,8 @@ set_target_properties(oclgl PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS OFF
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
-    EXCLUDE_FROM_ALL TRUE)
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst)
 
 target_compile_definitions(oclgl
     PRIVATE
@@ -67,3 +67,7 @@ foreach(TEST ${TESTS})
             ${CMAKE_BINARY_DIR}/tests/ocltst
         USES_TERMINAL)
 endforeach()
+
+INSTALL(TARGETS oclgl DESTINATION tests/ocltst)
+INSTALL(FILES oclgl.exclude DESTINATION tests/ocltst)
+
diff --git a/projects/clr/opencl/tests/ocltst/module/include/BaseTestImp.h b/projects/clr/opencl/tests/ocltst/module/include/BaseTestImp.h
index b21045f902..47ff996893 100644
--- a/projects/clr/opencl/tests/ocltst/module/include/BaseTestImp.h
+++ b/projects/clr/opencl/tests/ocltst/module/include/BaseTestImp.h
@@ -34,6 +34,7 @@
 #define KERNEL(...) #__VA_ARGS__
 
 #ifdef _MSC_VER
+#define NOMINMAX
 #define snprintf sprintf_s
 #endif
 
diff --git a/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
index a97c0bbb75..bf6eb66e49 100644
--- a/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
@@ -90,8 +90,8 @@ set_target_properties(oclperf PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS OFF
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
-    EXCLUDE_FROM_ALL TRUE)
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst)
 
 target_compile_definitions(oclperf
     PRIVATE
@@ -139,3 +139,7 @@ foreach(TEST ${TESTS})
             ${CMAKE_BINARY_DIR}/tests/ocltst
         USES_TERMINAL)
 endforeach()
+
+INSTALL(TARGETS oclperf DESTINATION tests/ocltst)
+INSTALL(FILES oclperf.exclude DESTINATION tests/ocltst)
+
diff --git a/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
index d711a3200b..74817054d9 100644
--- a/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
@@ -58,8 +58,8 @@ set_target_properties(oclruntime PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS OFF
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
-    EXCLUDE_FROM_ALL TRUE)
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst)
 
 target_compile_definitions(oclruntime
     PRIVATE
@@ -107,3 +107,7 @@ foreach(TEST ${TESTS})
             ${CMAKE_BINARY_DIR}/tests/ocltst
         USES_TERMINAL)
 endforeach()
+
+INSTALL(TARGETS oclruntime DESTINATION tests/ocltst)
+INSTALL(FILES oclruntime.exclude DESTINATION tests/ocltst)
+