diff --git a/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
index 4ec3d5061e..efe7f3ff2f 100644
--- a/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
@@ -48,8 +48,8 @@ add_custom_command(
 
 add_custom_target(test.ocltst.oclgl
     COMMAND
-        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
-        $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclgl> -A oclgl.exclude
+        ${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
+        $<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclgl> -A oclgl.exclude
     DEPENDS
         ocltst oclgl amdocl
     WORKING_DIRECTORY
@@ -59,8 +59,8 @@ add_custom_target(test.ocltst.oclgl
 foreach(TEST ${TESTS})
     add_custom_target(test.ocltst.oclgl.${TEST}
         COMMAND
-            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
-            $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclgl> -t ${TEST}
+            ${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
+            $<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclgl> -t ${TEST}
         DEPENDS
             ocltst oclgl amdocl
         WORKING_DIRECTORY
diff --git a/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
index c7434ee0c0..a97c0bbb75 100644
--- a/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
@@ -120,8 +120,8 @@ add_custom_command(
 
 add_custom_target(test.ocltst.oclperf
     COMMAND
-        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
-        $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclperf> -A oclperf.exclude
+        ${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
+        $<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclperf> -A oclperf.exclude
     DEPENDS
         ocltst oclperf amdocl
     WORKING_DIRECTORY
@@ -131,8 +131,8 @@ add_custom_target(test.ocltst.oclperf
 foreach(TEST ${TESTS})
     add_custom_target(test.ocltst.oclperf.${TEST}
         COMMAND
-            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
-            $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclperf> -t ${TEST}
+            ${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
+            $<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclperf> -t ${TEST}
         DEPENDS
             ocltst oclperf amdocl
         WORKING_DIRECTORY
diff --git a/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
index cdfe1a55a3..d711a3200b 100644
--- a/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
@@ -88,8 +88,8 @@ add_custom_command(
 
 add_custom_target(test.ocltst.oclruntime
     COMMAND
-        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
-        $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclruntime> -A oclruntime.exclude
+        ${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
+        $<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclruntime> -A oclruntime.exclude
     DEPENDS
         ocltst oclruntime amdocl
     WORKING_DIRECTORY
@@ -99,8 +99,8 @@ add_custom_target(test.ocltst.oclruntime
 foreach(TEST ${TESTS})
     add_custom_target(test.ocltst.oclruntime.${TEST}
         COMMAND
-            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
-            $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclruntime> -t ${TEST}
+            ${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
+            $<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclruntime> -t ${TEST}
         DEPENDS
             ocltst oclruntime amdocl
         WORKING_DIRECTORY