diff --git a/projects/clr/hipamd/tests/src/CMakeLists.txt b/projects/clr/hipamd/tests/src/CMakeLists.txt
index cbf5860e8d..111d945464 100644
--- a/projects/clr/hipamd/tests/src/CMakeLists.txt
+++ b/projects/clr/hipamd/tests/src/CMakeLists.txt
@@ -153,7 +153,9 @@ make_hip_executable (hip_popc hip_popc.cpp)
 make_hip_executable (hip_clz hip_clz.cpp) 
 make_hip_executable (hip_brev hip_brev.cpp) 
 make_hip_executable (hip_ffs hip_ffs.cpp) 
-make_hip_executable (hip_test_ldg hip_test_ldg.cpp)
+if (${HIP_PLATFORM} STREQUAL "hcc")
+    make_hip_executable (hip_test_ldg hip_test_ldg.cpp)
+endif()
 make_hip_executable (hipGetDeviceAttribute hipGetDeviceAttribute.cpp) 
 make_hip_executable (hipEnvVar hipEnvVar.cpp) 
 make_hip_executable (hipEnvVarDriver hipEnvVarDriver.cpp) 
@@ -196,7 +198,6 @@ make_test(hip_popc " " )
 make_test(hip_brev " " )
 make_test(hip_clz " " )
 make_test(hip_ffs " " )
-make_test(hip_test_ldg " " )
 make_test(hipEventRecord --iterations 10)
 make_test(hipMemset " " )
 make_test(hipMemset --N 10    --memsetval 0x42 )  # small copy, just 10 bytes.
@@ -228,10 +229,8 @@ make_test(hipStreamL5 " ")
 make_test(hipRandomMemcpyAsync " ")
 #make_test(hipAPIStreamEnable " ")
 #make_test(hipAPIStreamDisable " ")
-make_test(hipMemoryAllocate " ")
 make_test(hipFuncSetDeviceFlags " ")
 make_test(hipFuncGetDevice " ")
-make_test(hipFuncSetDevice " ")
 make_test(hipFuncDeviceSynchronize " ")
 make_test(hipTestMemcpyPin " ")
 make_named_test (hipMultiThreadDevice "hipMultiThreadDevice-serial" --tests 0x1) 
@@ -245,4 +244,10 @@ if (${HIP_MULTI_GPU})
 
 endif()
 
+if (${HIP_PLATFORM} STREQUAL "hcc")
+    make_test(hip_test_ldg " " )
+    make_test(hipMemoryAllocate " ")
+    make_test(hipFuncSetDevice " ")
+endif()
+
 make_hipify_test(specialFunc.cu )