diff --git a/tests/src/hipArray.cpp b/tests/src/hipArray.cpp
index 49add786d8..e32e2c0e5c 100644
--- a/tests/src/hipArray.cpp
+++ b/tests/src/hipArray.cpp
@@ -1,3 +1,9 @@
+/* HIT_START
+ * BUILD: %t %s test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * RUN: %t EXCLUDE_HIP_PLATFORM
+ * HIT_END
+ */
+
 #include "hip_runtime.h"
 #include "test_common.h"
 
diff --git a/tests/src/hipDynamicShared.cpp b/tests/src/hipDynamicShared.cpp
index 5686f9ee88..2ed793608b 100644
--- a/tests/src/hipDynamicShared.cpp
+++ b/tests/src/hipDynamicShared.cpp
@@ -20,6 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t EXCLUDE_HIP_PLATFORM nvcc
+ * HIT_END
+ */
+
 #include <hip_runtime.h>
 #include "test_common.h"
 
diff --git a/tests/src/hipEnvVar.cpp b/tests/src/hipEnvVar.cpp
index 229fa390c2..babfc73832 100644
--- a/tests/src/hipEnvVar.cpp
+++ b/tests/src/hipEnvVar.cpp
@@ -20,6 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * HIT_END
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/src/hipEnvVarDriver.cpp b/tests/src/hipEnvVarDriver.cpp
index b5cab268b7..255cc72806 100644
--- a/tests/src/hipEnvVarDriver.cpp
+++ b/tests/src/hipEnvVarDriver.cpp
@@ -15,6 +15,12 @@ EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
 THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp NVCC_OPTIONS -std=c++11
+ * RUN: %t
+ * HIT_END
+ */
+
 #include <iostream>
 #include <vector>
 #include <stdio.h>
diff --git a/tests/src/hipEventRecord.cpp b/tests/src/hipEventRecord.cpp
index 90e705f5c3..07b2068fac 100644
--- a/tests/src/hipEventRecord.cpp
+++ b/tests/src/hipEventRecord.cpp
@@ -23,6 +23,11 @@ THE SOFTWARE.
 // Through manual inspection of the reported timestamps, can determine if recording a NULL event forces synchronization : 
 // set 
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t --iterations 10
+ * HIT_END
+ */
 
 #include "hip_runtime.h"
 #include "test_common.h"
diff --git a/tests/src/hipFuncDeviceSynchronize.cpp b/tests/src/hipFuncDeviceSynchronize.cpp
index bb274f47bc..6d05253536 100644
--- a/tests/src/hipFuncDeviceSynchronize.cpp
+++ b/tests/src/hipFuncDeviceSynchronize.cpp
@@ -22,6 +22,12 @@ THE SOFTWARE.
  * hipError_t hipDeviceSynchronize();
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include"test_common.h"
 
 #define _SIZE sizeof(int)*1024*1024
diff --git a/tests/src/hipFuncGetDevice.cpp b/tests/src/hipFuncGetDevice.cpp
index c4785ece00..f903149f91 100644
--- a/tests/src/hipFuncGetDevice.cpp
+++ b/tests/src/hipFuncGetDevice.cpp
@@ -22,6 +22,12 @@ THE SOFTWARE.
  * hipError_t hipGetDevice(int *device);
  */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include "test_common.h"
 
 int main()
diff --git a/tests/src/hipFuncSetDevice.cpp b/tests/src/hipFuncSetDevice.cpp
index fd13d21325..030ceb7b0c 100644
--- a/tests/src/hipFuncSetDevice.cpp
+++ b/tests/src/hipFuncSetDevice.cpp
@@ -17,6 +17,12 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t EXCLUDE_HIP_PLATFORM
+ * HIT_END
+ */
+
 #include "test_common.h"
 
 int main(){
diff --git a/tests/src/hipFuncSetDeviceFlags.cpp b/tests/src/hipFuncSetDeviceFlags.cpp
index a3d81e8b5a..ccc81b11ac 100644
--- a/tests/src/hipFuncSetDeviceFlags.cpp
+++ b/tests/src/hipFuncSetDeviceFlags.cpp
@@ -17,6 +17,12 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include "test_common.h"
 
 int main()
diff --git a/tests/src/hipGetDeviceAttribute.cpp b/tests/src/hipGetDeviceAttribute.cpp
index 51bf29f9e6..f94910459f 100644
--- a/tests/src/hipGetDeviceAttribute.cpp
+++ b/tests/src/hipGetDeviceAttribute.cpp
@@ -21,6 +21,12 @@ THE SOFTWARE.
 */
 // Test the device info API extensions for HIP:
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t EXCLUDE_HIP_PLATFORM nvcc
+ * HIT_END
+ */
+
 #include <stdio.h>
 #include <iostream>
 #include <hip_runtime.h>
@@ -70,15 +76,15 @@ int main(int argc, char *argv[])
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMemoryClockRate, props.memoryClockRate));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMemoryBusWidth, props.memoryBusWidth));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMultiprocessorCount, props.multiProcessorCount));
-    CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeIsMultiGpuBoard, props.isMultiGpuBoard));
+    CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeIsMultiGpuBoard, props.isMultiGpuBoard));//
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeComputeMode, props.computeMode));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeL2CacheSize, props.l2CacheSize));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMaxThreadsPerMultiProcessor, props.maxThreadsPerMultiProcessor));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeComputeCapabilityMajor, props.major));
-    CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeComputeCapabilityMinor, props.minor));
+    CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeComputeCapabilityMinor, props.minor));//
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeConcurrentKernels, props.concurrentKernels));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributePciBusId, props.pciBusID));
-    CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributePciDeviceId, props.pciDeviceID));
+    CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributePciDeviceId, props.pciDeviceID));//
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMaxSharedMemoryPerMultiprocessor, props.maxSharedMemoryPerMultiProcessor));
     passed();
 
diff --git a/tests/src/hipHcc.cpp b/tests/src/hipHcc.cpp
index e3740fa27b..f9bd584faa 100644
--- a/tests/src/hipHcc.cpp
+++ b/tests/src/hipHcc.cpp
@@ -21,6 +21,12 @@ THE SOFTWARE.
 */
 // Test the HCC-specific API extensions for HIP:
 
+/* HIT_START
+ * BUILD: %t %s HCC_OPTIONS --stdlib=libc++
+ * RUN: %t
+ * HIT_END
+ */
+
 #include <stdio.h>
 #include <iostream>
 #include <hip_runtime.h>
diff --git a/tests/src/hipHostAlloc.cpp b/tests/src/hipHostAlloc.cpp
index a6c4cb20e0..d1950f825f 100644
--- a/tests/src/hipHostAlloc.cpp
+++ b/tests/src/hipHostAlloc.cpp
@@ -20,6 +20,12 @@
    THE SOFTWARE.
    */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include"test_common.h"
 
 #define LEN 1024*1024
diff --git a/tests/src/hipHostGetFlags.cpp b/tests/src/hipHostGetFlags.cpp
index c0250055ae..8664095422 100644
--- a/tests/src/hipHostGetFlags.cpp
+++ b/tests/src/hipHostGetFlags.cpp
@@ -20,6 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include"test_common.h"
 #include<malloc.h>
 
diff --git a/tests/src/hipHostRegister.cpp b/tests/src/hipHostRegister.cpp
index 4c85358e06..e9044d5a86 100644
--- a/tests/src/hipHostRegister.cpp
+++ b/tests/src/hipHostRegister.cpp
@@ -17,6 +17,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include"test_common.h"
 #include<malloc.h>
 
diff --git a/tests/src/hipLaunchParm.cpp b/tests/src/hipLaunchParm.cpp
index 26ad94f182..0e8248aebc 100644
--- a/tests/src/hipLaunchParm.cpp
+++ b/tests/src/hipLaunchParm.cpp
@@ -17,6 +17,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include"hip_runtime.h"
 #include"test_common.h"
 #include"hip_runtime_api.h"
diff --git a/tests/src/hipPeerToPeer_simple.cpp b/tests/src/hipPeerToPeer_simple.cpp
index de89b36f46..0e99e9bfb8 100644
--- a/tests/src/hipPeerToPeer_simple.cpp
+++ b/tests/src/hipPeerToPeer_simple.cpp
@@ -22,6 +22,14 @@ THE SOFTWARE.
 // Simple test for memset.
 // Also serves as a template for other tests.
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t EXCLUDE_HIP_PLATFORM all
+ * RUN: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM all
+ * RUN: %t --mirrorPeers EXCLUDE_HIP_PLATFORM all
+ * HIT_END
+ */
+
 #include "hip_runtime.h"
 #include "test_common.h"
 
diff --git a/tests/src/hipRandomMemcpyAsync.cpp b/tests/src/hipRandomMemcpyAsync.cpp
index 8f06c5fbeb..b00987b6c3 100644
--- a/tests/src/hipRandomMemcpyAsync.cpp
+++ b/tests/src/hipRandomMemcpyAsync.cpp
@@ -17,6 +17,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/src/hipTestMemcpyPin.cpp b/tests/src/hipTestMemcpyPin.cpp
index c36170003c..7240a6cf6e 100644
--- a/tests/src/hipTestMemcpyPin.cpp
+++ b/tests/src/hipTestMemcpyPin.cpp
@@ -17,6 +17,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+/* HIT_START
+ * BUILD: %t %s test_common.cpp
+ * RUN: %t
+ * HIT_END
+ */
+
 #include<hip_runtime.h>
 #include"test_common.h"