diff --git a/tests/src/runtimeApi/graph/hipGraph.cpp b/tests/src/runtimeApi/graph/hipGraph.cpp
index 3fa0f9e09e..c38e4f2f75 100644
--- a/tests/src/runtimeApi/graph/hipGraph.cpp
+++ b/tests/src/runtimeApi/graph/hipGraph.cpp
@@ -21,7 +21,7 @@
 #include <vector>
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * TEST: %t
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 #define THREADS_PER_BLOCK 512
@@ -237,4 +237,4 @@ int main(int argc, char** argv) {
     failed("Failed during hip Graphs during stream capture\n");
   }
   passed();
-}
\ No newline at end of file
+}
diff --git a/tests/src/runtimeApi/memory/hipHostMallocTests.cpp b/tests/src/runtimeApi/memory/hipHostMallocTests.cpp
index 8bf8d7f31b..7243813ef3 100644
--- a/tests/src/runtimeApi/memory/hipHostMallocTests.cpp
+++ b/tests/src/runtimeApi/memory/hipHostMallocTests.cpp
@@ -39,8 +39,8 @@ Testcase Scenarios :
 /* HIT_START
  * BUILD_CMD: %t %hc %S/%s %S/../../test_common.cpp -I%S/../../ -o %T/%t -ldl -std=c++11
  * TEST: %t --tests 1
- * TEST: %t --tests 2 EXCLUDE_HIP_PLATFORM nvidia
- * TEST: %t --tests 3 EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t --tests 2
+ * TEST: %t --tests 3
  * HIT_END
  */
 
diff --git a/tests/src/runtimeApi/memory/hipMallocManaged_MultiScenario.cpp b/tests/src/runtimeApi/memory/hipMallocManaged_MultiScenario.cpp
index 1792026514..96f1ffda6c 100644
--- a/tests/src/runtimeApi/memory/hipMallocManaged_MultiScenario.cpp
+++ b/tests/src/runtimeApi/memory/hipMallocManaged_MultiScenario.cpp
@@ -24,7 +24,7 @@ THE SOFTWARE.
  * TEST_NAMED: %t hipMallocManaged2 --tests 2
  * TEST_NAMED: %t hipMallocManagedNegativeTests --tests 3
  * TEST_NAMED: %t hipMallocManagedMultiChunkSingleDevice --tests 4
- * TEST_NAMED: %t hipMallocManagedMultiChunkMultiDevice --tests 5 EXCLUDE_HIP_PLATFORM nvidia
+ * TEST_NAMED: %t hipMallocManagedMultiChunkMultiDevice --tests 5
  * TEST_NAMED: %t hipMallocManagedOversubscription --tests 6 EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr
  * HIT_END
  */
diff --git a/tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp b/tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp
index 14374a8c70..0091633f0e 100644
--- a/tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp
+++ b/tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp
@@ -29,7 +29,7 @@ THE SOFTWARE.
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
  * TEST_NAMED: %t hipMemcpyAtoH_simple --tests 1
- * TEST_NAMED: %t hipMemcpyAtoH_DeviceContextChange --tests 3 EXCLUDE_HIP_PLATFORM nvidia
+ * TEST_NAMED: %t hipMemcpyAtoH_DeviceContextChange --tests 3
  * TEST_NAMED: %t hipMemcpyAtoH_NegativeTests --tests 4
  * TEST_NAMED: %t hipMemcpyAtoH_PinnedHostMemory --tests 5
  * HIT_END
diff --git a/tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp b/tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp
index 7f0fcc73dc..41559330f6 100644
--- a/tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp
+++ b/tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp
@@ -30,7 +30,7 @@ THE SOFTWARE.
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
  * TEST_NAMED: %t hipMemcpyHtoA_simple --tests 1
- * TEST_NAMED: %t hipMemcpyHtoA_DeviceContextChange --tests 3 EXCLUDE_HIP_PLATFORM nvidia
+ * TEST_NAMED: %t hipMemcpyHtoA_DeviceContextChange --tests 3
  * TEST_NAMED: %t hipMemcpyHtoA_NegativeTests --tests 4
  * TEST_NAMED: %t hipMemcpyHtoA_PinnedHostMemory --tests 5
  * HIT_END
diff --git a/tests/src/runtimeApi/module/hipModule.cpp b/tests/src/runtimeApi/module/hipModule.cpp
index a1f195d9ec..b13bea1f70 100755
--- a/tests/src/runtimeApi/module/hipModule.cpp
+++ b/tests/src/runtimeApi/module/hipModule.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
  * BUILD_CMD: vcpy_kernel.code %hc --genco %S/vcpy_kernel.cpp -o vcpy_kernel.code
  * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
  * TEST: %t --tests 0x1
- * TEST: %t --tests 0x2 EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t --tests 0x2
  * HIT_END
  */
 
diff --git a/tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp b/tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp
index dfc1f6ce83..f8b436068b 100644
--- a/tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp
+++ b/tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp
@@ -39,7 +39,6 @@ THE SOFTWARE.
 #define LEN 64
 #define SIZE LEN << 2
 #define THREADS 8
-#define MAX_THREADS 512
 
 #define FILENAME "vcpy_kernel.code"
 #define kernel_name "hello_world"