diff --git a/tests/hip_tests.txt b/tests/hip_tests.txt
index f3ea49a0f9..67a4238520 100644
--- a/tests/hip_tests.txt
+++ b/tests/hip_tests.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8.3)
 project(hip_tests)
 
 # Setup
-set(HIP_PATH @CMAKE_INSTALL_PREFIX@)
-set(ENV{HIP_PATH} ${HIP_PATH})
+#set(HIP_PATH @CMAKE_INSTALL_PREFIX@)
+#set(ENV{HIP_PATH} ${HIP_PATH})
 set(HIP_SRC_PATH @hip_SOURCE_DIR@)
 set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
 include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
diff --git a/tests/src/deviceLib/hipSimpleAtomicsTest.cpp b/tests/src/deviceLib/hipSimpleAtomicsTest.cpp
index 760d65e555..029191aebf 100644
--- a/tests/src/deviceLib/hipSimpleAtomicsTest.cpp
+++ b/tests/src/deviceLib/hipSimpleAtomicsTest.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 --gpu-architecture=sm_60
+ * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 --gpu-architecture=sm_60 EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/deviceLib/hipTestDeviceSymbol.cpp b/tests/src/deviceLib/hipTestDeviceSymbol.cpp
index 4c2dd279ea..56b2d9c8e1 100644
--- a/tests/src/deviceLib/hipTestDeviceSymbol.cpp
+++ b/tests/src/deviceLib/hipTestDeviceSymbol.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/deviceLib/hip_anyall.cpp b/tests/src/deviceLib/hip_anyall.cpp
index c77a3cd25d..aa27d106b7 100644
--- a/tests/src/deviceLib/hip_anyall.cpp
+++ b/tests/src/deviceLib/hip_anyall.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations
+ * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/deviceLib/hip_ballot.cpp b/tests/src/deviceLib/hip_ballot.cpp
index 324047a6b1..3728575e80 100644
--- a/tests/src/deviceLib/hip_ballot.cpp
+++ b/tests/src/deviceLib/hip_ballot.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations
+ * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/deviceLib/hip_test_ldg.cpp b/tests/src/deviceLib/hip_test_ldg.cpp
index 0f97c1f0ad..ccd87c4661 100644
--- a/tests/src/deviceLib/hip_test_ldg.cpp
+++ b/tests/src/deviceLib/hip_test_ldg.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --gpu-architecture=sm_35
+ * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --gpu-architecture=sm_35 EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/gcc/LaunchKernel.c b/tests/src/gcc/LaunchKernel.c
index 189d3ce614..f797dfcb5a 100644
--- a/tests/src/gcc/LaunchKernel.c
+++ b/tests/src/gcc/LaunchKernel.c
@@ -19,10 +19,10 @@
 
 
 /* HIT_START
- * BUILD_CMD: gpu.o %hc -I%hip-path/include -g -c %S/gpu.cpp -o %T/gpu.o EXCLUDE_HIP_PLATFORM nvcc
- * BUILD_CMD: launchkernel.o %cc -D__HIP_PLATFORM_HCC__ -g -I%hip-path/include -c %S/LaunchKernel.c -o %T/launchkernel.o EXCLUDE_HIP_PLATFORM nvcc
- * BUILD_CMD: LaunchKernel %hc %T/launchkernel.o %T/gpu.o -g -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/%t DEPENDS gpu.o launchkernel.o EXCLUDE_HIP_PLATFORM nvcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD_CMD: gpu.o %hc -I%hip-path/include -g -c %S/gpu.cpp -o %T/gpu.o EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD_CMD: launchkernel.o %cc -D__HIP_PLATFORM_HCC__ -g -I%hip-path/include -c %S/LaunchKernel.c -o %T/launchkernel.o EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD_CMD: LaunchKernel %hc %T/launchkernel.o %T/gpu.o -g -Wl,--rpath=%hip-path/lib %hip-path/lib/libhip_hcc.so -o %T/%t DEPENDS gpu.o launchkernel.o EXCLUDE_HIP_PLATFORM nvcc vdi
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvcc vdi
  * HIT_END
  */
 
diff --git a/tests/src/hipHcc.cpp b/tests/src/hipHcc.cpp
index 9bcc999b34..5ebc2b820f 100644
--- a/tests/src/hipHcc.cpp
+++ b/tests/src/hipHcc.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 // Test the HCC-specific API extensions for HIP:
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc vdi
  * TEST: %t EXCLUDE_HIP_PLATFORM all
  * HIT_END
  */
diff --git a/tests/src/kernel/hipExtLaunchKernelGGL.cpp b/tests/src/kernel/hipExtLaunchKernelGGL.cpp
index 4164a87f1e..3fb6dd5fb5 100644
--- a/tests/src/kernel/hipExtLaunchKernelGGL.cpp
+++ b/tests/src/kernel/hipExtLaunchKernelGGL.cpp
@@ -19,7 +19,7 @@ THE SOFTWARE.
 // Test the Grid_Launch syntax.
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/kernel/hipTestConstant.cpp b/tests/src/kernel/hipTestConstant.cpp
index 575e28966f..5dda5d5b0a 100644
--- a/tests/src/kernel/hipTestConstant.cpp
+++ b/tests/src/kernel/hipTestConstant.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../test_common.cpp  EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/p2p/hipPeerToPeer_simple.cpp b/tests/src/p2p/hipPeerToPeer_simple.cpp
index 90e7112356..c2e5965e39 100644
--- a/tests/src/p2p/hipPeerToPeer_simple.cpp
+++ b/tests/src/p2p/hipPeerToPeer_simple.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 // Also serves as a template for other tests.
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../test_common.cpp  EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t EXCLUDE_HIP_PLATFORM hcc vdi
  * TEST: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM hcc vdi
  * TEST: %t --mirrorPeers EXCLUDE_HIP_PLATFORM hcc vdi
diff --git a/tests/src/runtimeApi/memory/hipMemset2D.cpp b/tests/src/runtimeApi/memory/hipMemset2D.cpp
index e7fe932b3d..83c73416a3 100644
--- a/tests/src/runtimeApi/memory/hipMemset2D.cpp
+++ b/tests/src/runtimeApi/memory/hipMemset2D.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 // Also serves as a template for other tests.
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/runtimeApi/memory/p2p_copy_coherency.cpp b/tests/src/runtimeApi/memory/p2p_copy_coherency.cpp
index 3db855c400..d02053d247 100644
--- a/tests/src/runtimeApi/memory/p2p_copy_coherency.cpp
+++ b/tests/src/runtimeApi/memory/p2p_copy_coherency.cpp
@@ -23,9 +23,10 @@ THE SOFTWARE.
 // Also serves as a template for other tests.
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t EXCLUDE_HIP_PLATFORM all
  * HIT_END
+
  */
 
 #include "hip/hip_runtime.h"
diff --git a/tests/src/runtimeApi/module/hipExtLaunchMultiKernelMultiDevice.cpp b/tests/src/runtimeApi/module/hipExtLaunchMultiKernelMultiDevice.cpp
index fe9b06713c..cc7a06d66b 100644
--- a/tests/src/runtimeApi/module/hipExtLaunchMultiKernelMultiDevice.cpp
+++ b/tests/src/runtimeApi/module/hipExtLaunchMultiKernelMultiDevice.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 // single GPU or multi GPUs.
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp b/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
index f4c72ca1c5..3c85a8afea 100755
--- a/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
+++ b/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
@@ -18,8 +18,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvcc
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/runtimeApi/module/tex2d_kernel.cpp b/tests/src/runtimeApi/module/tex2d_kernel.cpp
index b12dd1815d..bf0ecc8c1b 100644
--- a/tests/src/runtimeApi/module/tex2d_kernel.cpp
+++ b/tests/src/runtimeApi/module/tex2d_kernel.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD_CMD: tex2d_kernel.code %hc --genco %S/tex2d_kernel.cpp -o tex2d_kernel.code
+ * BUILD_CMD: tex2d_kernel.code %hc --genco %S/tex2d_kernel.cpp -o tex2d_kernel.code  EXCLUDE_HIP_PLATFORM vdi
  * HIT_END
  */
 
diff --git a/tests/src/surface/hipSurfaceObj2D.cpp b/tests/src/surface/hipSurfaceObj2D.cpp
index 4580220d1d..2724604279 100644
--- a/tests/src/surface/hipSurfaceObj2D.cpp
+++ b/tests/src/surface/hipSurfaceObj2D.cpp
@@ -1,5 +1,5 @@
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/texture/hipBindTex2DPitch.cpp b/tests/src/texture/hipBindTex2DPitch.cpp
index 905e24bce3..772d6b6050 100644
--- a/tests/src/texture/hipBindTex2DPitch.cpp
+++ b/tests/src/texture/hipBindTex2DPitch.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /*HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/texture/hipBindTexRef1DFetch.cpp b/tests/src/texture/hipBindTexRef1DFetch.cpp
index 52a0d99ac1..650db5bc29 100644
--- a/tests/src/texture/hipBindTexRef1DFetch.cpp
+++ b/tests/src/texture/hipBindTexRef1DFetch.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../test_common.cpp  EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/texture/hipNormalizedFloatValueTex.cpp b/tests/src/texture/hipNormalizedFloatValueTex.cpp
index 0a9c879376..69517d71dd 100644
--- a/tests/src/texture/hipNormalizedFloatValueTex.cpp
+++ b/tests/src/texture/hipNormalizedFloatValueTex.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/texture/simpleTexture2DLayered.cpp b/tests/src/texture/simpleTexture2DLayered.cpp
index e3ba6d9afe..186c9995d9 100644
--- a/tests/src/texture/simpleTexture2DLayered.cpp
+++ b/tests/src/texture/simpleTexture2DLayered.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/texture/simpleTexture3D.cpp b/tests/src/texture/simpleTexture3D.cpp
index 741b1671af..1b3cc49782 100644
--- a/tests/src/texture/simpleTexture3D.cpp
+++ b/tests/src/texture/simpleTexture3D.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
  * TEST: %t
  * HIT_END
  */