diff --git a/catch/CMakeLists.txt b/catch/CMakeLists.txt
index 0f852cc91b..f13276349c 100644
--- a/catch/CMakeLists.txt
+++ b/catch/CMakeLists.txt
@@ -282,6 +282,20 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${CATCH_BUILD_DIR}/catchInfo.txt ${_catch
 set(_subdirs ${_autogen} "subdirs(..)\n")
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${CATCH_BUILD_DIR}/CTestTestfile.cmake ${_subdirs})
 
+find_package(Python3 COMPONENTS Interpreter REQUIRED)
+
+# copy python script and headers to catch test package
+set(CATCH_INCLUDE_DIR include)
+execute_process(COMMAND ${CMAKE_COMMAND} -E
+                make_directory ${CMAKE_CURRENT_BINARY_DIR}/${CATCH_BUILD_DIR}/${CATCH_INCLUDE_DIR})
+
+file(COPY ./unit/compileAndCaptureOutput.py
+            DESTINATION  ${CMAKE_CURRENT_BINARY_DIR}/${CATCH_BUILD_DIR}/unit )
+
+file(COPY ./include/hip_test_common.hh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CATCH_BUILD_DIR}/${CATCH_INCLUDE_DIR})
+file(COPY ./include/hip_test_context.hh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CATCH_BUILD_DIR}/${CATCH_INCLUDE_DIR})
+file(COPY ./external/Catch2/catch.hpp DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CATCH_BUILD_DIR}/${CATCH_INCLUDE_DIR})
+
 # Enable device lambda on nvidia platforms
 if(HIP_PLATFORM STREQUAL "nvidia")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --extended-lambda")
diff --git a/catch/unit/assertion/CMakeLists.txt b/catch/unit/assertion/CMakeLists.txt
index c98656cf1c..361e6b867e 100644
--- a/catch/unit/assertion/CMakeLists.txt
+++ b/catch/unit/assertion/CMakeLists.txt
@@ -37,13 +37,20 @@ elseif(HIP_PLATFORM MATCHES "amd")
                           LINKER_LIBS hiprtc)
 endif()
 
-# Below tests fail in PSDB
+if(UNIX)
+file(GLOB NEGATIVE_TEST_SRC
+     "static_assert_kernels_positive.cc"
+     "static_assert_kernels_negative.cc")
+
+file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
 #add_test(NAME Unit_StaticAssert_Positive_Basic
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         static_assert_kernels_positive.cc 2)
 #
 #add_test(NAME Unit_StaticAssert_Negative_Basic
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         static_assert_kernels_negative.cc 2)
+endif()
\ No newline at end of file
diff --git a/catch/unit/atomics/CMakeLists.txt b/catch/unit/atomics/CMakeLists.txt
index 101d6dddc2..32320e40a0 100644
--- a/catch/unit/atomics/CMakeLists.txt
+++ b/catch/unit/atomics/CMakeLists.txt
@@ -95,68 +95,88 @@ if(HIP_PLATFORM MATCHES "amd")
                         TEST_SRC ${TEST_SRC}
                         TEST_TARGET_NAME build_tests
                         LINKER_LIBS hiprtc)
-  set(EXPECTED_ERRORS 48)
 
-  # Below tests fail in PSDB
-  #add_test(NAME Unit_atomicAnd_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicAnd_negative_kernels.cc ${EXPECTED_ERRORS})
-  #
-  #add_test(NAME Unit_atomicOr_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicOr_negative_kernels.cc ${EXPECTED_ERRORS})
-  #
-  #add_test(NAME Unit_atomicXor_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicXor_negative_kernels.cc ${EXPECTED_ERRORS})
-  #
-  #add_test(NAME Unit_atomicMin_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicMin_negative_kernels.cc ${EXPECTED_ERRORS})
-  #
-  #add_test(NAME Unit_atomicMax_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicMax_negative_kernels.cc ${EXPECTED_ERRORS})
-  #add_test(NAME Unit_AtomicBuiltins_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomic_builtins_kernels.cc 60 27) # Should be 35 warnings, see EXSWHTEC-309
-  #add_test(NAME Unit_atomicAdd_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicAdd_negative_kernels.cc 48)
-  #add_test(NAME Unit_atomicSub_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicSub_negative_kernels.cc 48)
-  #add_test(NAME Unit_atomicInc_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicInc_negative_kernels.cc 8)
-  #
-  #add_test(NAME Unit_atomicDec_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicDec_negative_kernels.cc 8)
-  #
-  #add_test(NAME Unit_atomicCAS_Negative_Parameters
-  #        COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #        ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #        atomicCAS_negative_kernels.cc 48)
-  #
-  # SWDEV-435667: Below 2 tests failed in stress test on 01/12/23
-  #add_test(NAME Unit_atomicExch_Negative_Parameters
-  #         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #         atomicExch_negative_kernels.cc 40)
-  #
-  #add_test(NAME Unit_atomicExch_system_Negative_Parameters
-  #         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-  #         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-  #         atomicExch_system_negative_kernels.cc 40)
+if(UNIX)
+  set(EXPECTED_ERRORS 40)
+
+  file(GLOB NEGATIVE_TEST_SRC
+        "atomicAnd_negative_kernels.cc"
+        "atomicOr_negative_kernels.cc"
+        "atomicXor_negative_kernels.cc"
+        "atomicMin_negative_kernels.cc"
+        "atomicMax_negative_kernels.cc"
+        "atomic_builtin_kernels.cc"
+        "atomicAdd_negative_kernels.cc"
+        "atomicSub_negative_kernels.cc"
+        "atomicInc_negative_kernels.cc"
+        "atomicDec_negative_kernels.cc"
+        "atomicCAS_negative_kernels.cc"
+        "atomicExch_negative_kernels.cc"
+        "atomicExch_system_negative_kernels.cc")
+
+  file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
+ # add_test(NAME Unit_atomicAnd_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicAnd_negative_kernels.cc ${EXPECTED_ERRORS})
+
+ # add_test(NAME Unit_atomicOr_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicOr_negative_kernels.cc ${EXPECTED_ERRORS})
+
+ # add_test(NAME Unit_atomicXor_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicXor_negative_kernels.cc ${EXPECTED_ERRORS})
+
+ # add_test(NAME Unit_atomicMin_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicMin_negative_kernels.cc 42)
+
+ # add_test(NAME Unit_atomicMax_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicMax_negative_kernels.cc 42)
+
+	#add_test(NAME Unit_AtomicBuiltins_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomic_builtin_kernels.cc 60 27)
+
+ #         add_test(NAME Unit_atomicAdd_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicAdd_negative_kernels.cc 48)
+ # add_test(NAME Unit_atomicSub_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicSub_negative_kernels.cc 48)
+ # add_test(NAME Unit_atomicInc_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicInc_negative_kernels.cc 8)
+
+ # add_test(NAME Unit_atomicDec_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicDec_negative_kernels.cc 8)
+
+ # add_test(NAME Unit_atomicCAS_Negative_Parameters
+ #         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #         ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #         atomicCAS_negative_kernels.cc 48)
+
+ # add_test(NAME Unit_atomicExch_Negative_Parameters
+ #          COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #          ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #          atomicExch_negative_kernels.cc 40)
+
+ # add_test(NAME Unit_atomicExch_system_Negative_Parameters
+ #          COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+ #          ./src ${HIP_PLATFORM} ${HIP_PATH}
+ #          atomicExch_system_negative_kernels.cc 40)
+endif()
 endif()
\ No newline at end of file
diff --git a/catch/unit/atomics/atomic_builtin_kernels.cc b/catch/unit/atomics/atomic_builtin_kernels.cc
index 27cd3eb95e..b515db7948 100644
--- a/catch/unit/atomics/atomic_builtin_kernels.cc
+++ b/catch/unit/atomics/atomic_builtin_kernels.cc
@@ -21,7 +21,6 @@ THE SOFTWARE.
 */
 
 #include <hip_test_common.hh>
-#include <resource_guards.hh>
 
 constexpr int kMemOrder = __ATOMIC_RELAXED;
 constexpr int kMemScope = __HIP_MEMORY_SCOPE_SYSTEM;
diff --git a/catch/unit/compileAndCaptureOutput.py b/catch/unit/compileAndCaptureOutput.py
index b5bb925cc4..449a0de05c 100644
--- a/catch/unit/compileAndCaptureOutput.py
+++ b/catch/unit/compileAndCaptureOutput.py
@@ -21,6 +21,7 @@
 import subprocess
 import sys
 import unittest
+import os
 
 class CompileAndCapture(unittest.TestCase):
   path = None
@@ -41,11 +42,14 @@ class CompileAndCapture(unittest.TestCase):
     self.assertTrue(self.platform == 'amd' or self.platform == 'nvidia')
 
   def test(self):
+    if os.name == 'nt':
+        hipcc = self.hip_path + '/bin/hipcc.bat'
+    else:
+        hipcc = self.hip_path + '/bin/hipcc'
+
     compiler_args = [
-      self.hip_path + '/bin/hipcc',
-      '-I' + self.path + '/../../external/Catch2',
-      '-I' + self.path + '/../../include',
-      '-I' + self.path + '/../../external/picojson',
+      hipcc,
+      '-I' + self.path + '/../../../include',
       '-c',
       self.path + '/' + self.file,
       ]
diff --git a/catch/unit/complex/CMakeLists.txt b/catch/unit/complex/CMakeLists.txt
index 7ca235b176..35223203f9 100644
--- a/catch/unit/complex/CMakeLists.txt
+++ b/catch/unit/complex/CMakeLists.txt
@@ -34,40 +34,51 @@ hip_add_exe_to_target(NAME ComplexTest
                       TEST_SRC ${TEST_SRC}
                       TEST_TARGET_NAME build_tests
                       LINKER_LIBS ${LINKER_LIBS})
+if(UNIX)
+file(GLOB NEGATIVE_TEST_SRC
+      "complex_make_negative_kernels.cc"
+      "complex_cast_negative_kernels.cc"
+      "complex_negative_kernels_1Arg_float.cc"
+      "complex_negative_kernels_1Arg_double.cc"
+      "complex_negative_kernels_2Arg_float.cc"
+      "complex_negative_kernels_2Arg_double.cc"
+      "complex_negative_kernels_3Arg.cc"
+       )
+
+file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
 
-# These tests fail in PSDB
 #add_test(NAME Unit_Device_Complex_make_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         complex_make_negative_kernels.cc 54)
 #
 #add_test(NAME Unit_Device_Complex_Cast_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         complex_cast_negative_kernels.cc 28)
 #
 #add_test(NAME Unit_Device_Complex_Unary_float_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         complex_negative_kernels_1Arg_float.cc 62)
 #
 #add_test(NAME Unit_Device_Complex_Unary_double_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         complex_negative_kernels_1Arg_double.cc 62)
 #
 #add_test(NAME Unit_Device_Complex_Binary_float_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         complex_negative_kernels_2Arg_float.cc 88)
 #
 #add_test(NAME Unit_Device_Complex_Binary_double_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         complex_negative_kernels_2Arg_double.cc 88)
 #
 #add_test(NAME Unit_Device_Complex_hipCfma_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         complex_negative_kernels_3Arg.cc 60)
-
+endif()
diff --git a/catch/unit/device_memory/CMakeLists.txt b/catch/unit/device_memory/CMakeLists.txt
index 984062576d..e0a6adc27f 100644
--- a/catch/unit/device_memory/CMakeLists.txt
+++ b/catch/unit/device_memory/CMakeLists.txt
@@ -45,14 +45,21 @@ elseif (HIP_PLATFORM MATCHES "nvidia")
                     COMPILE_OPTIONS -std=c++17)
 endif()
 
-# This test fails in PSDB
-#add_test(NAME Unit_Device_memcpy_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#         memcpy_negative_kernels.cc 4)
+if(UNIX)
+file(GLOB NEGATIVE_TEST_SRC
+     "memcpy_negative_kernels.cc"
+     "memset_negative_kernels.cc"
+    )
 
-# This test fails in PSDB
+file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
+#add_test(NAME Unit_Device_memcpy_Negative
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
+#         memcpy_negative_kernels.cc 4)
+#
 #add_test(NAME Unit_Device_memset_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         memset_negative_kernels.cc 4)
+endif()
\ No newline at end of file
diff --git a/catch/unit/hip_specific/CMakeLists.txt b/catch/unit/hip_specific/CMakeLists.txt
index cb0601e430..28dbf42a97 100644
--- a/catch/unit/hip_specific/CMakeLists.txt
+++ b/catch/unit/hip_specific/CMakeLists.txt
@@ -23,15 +23,19 @@
 set(TEST_SRC
     hip_hc_8pk.cc
 )
-
 hip_add_exe_to_target(NAME HipSpecificTest
                       TEST_SRC ${TEST_SRC}
                       TEST_TARGET_NAME build_tests
                       LINKER_LIBS hiprtc
                       PROPERTY CXX_STANDARD 17)
+if(UNIX)
+file(GLOB NEGATIVE_TEST_SRC
+     "hip_hc_8pk_negative_kernels.cc" )
+
+file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
 
-# This test fails in PSDB
 #add_test(NAME Unit_Device__hip_hc_8pk_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         hip_hc_8pk_negative_kernels.cc 90)
+endif()
\ No newline at end of file
diff --git a/catch/unit/launchBounds/CMakeLists.txt b/catch/unit/launchBounds/CMakeLists.txt
index e377ebe5d9..e34cfe2e84 100644
--- a/catch/unit/launchBounds/CMakeLists.txt
+++ b/catch/unit/launchBounds/CMakeLists.txt
@@ -34,15 +34,28 @@ elseif(HIP_PLATFORM MATCHES "amd")
                           LINKER_LIBS hiprtc)
 endif()
 
-# Below tests fail in PSDB
+if(UNIX)
+file(GLOB NEGATIVE_TEST_SRC
+     "launch_bounds_compiler_error_kernels.cc"
+      "launch_bounds_parse_error_kernels.cc")
+
+file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
+#if(HIP_PLATFORM MATCHES "nvidia")
+# set(EXPECTED_ERRORS 2)
+#elseif(HIP_PLATFORM MATCHES "amd")
+# set(EXPECTED_ERRORS 3)
+#endif()
+#
 #add_test(NAME Unit_Kernel_Launch_bounds_Negative_Parameters_CompilerError
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#         launch_bounds_compiler_error_kernels.cc -1)
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
+#         launch_bounds_compiler_error_kernels.cc ${EXPECTED_ERRORS})
 #
 #if(HIP_PLATFORM MATCHES "amd")
-#    add_test(NAME Unit_Kernel_Launch_bounds_Negative_Parameters_ParseError
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            launch_bounds_parse_error_kernels.cc -1)
+#	add_test(NAME Unit_Kernel_Launch_bounds_Negative_Parameters_ParseError
+#        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#        ./src ${HIP_PLATFORM} ${HIP_PATH}
+#        launch_bounds_parse_error_kernels.cc 0 0)
 #endif()
+endif()
\ No newline at end of file
diff --git a/catch/unit/math/CMakeLists.txt b/catch/unit/math/CMakeLists.txt
index a5d1f58faf..cb05be3aee 100644
--- a/catch/unit/math/CMakeLists.txt
+++ b/catch/unit/math/CMakeLists.txt
@@ -61,104 +61,133 @@ else()
   message(STATUS "Boost not found. Dependent math tests not enabled.")
 endif()
 
-# Below tests fail in PSDB
-#add_test(NAME Unit_Device_Single_Precision_Trig_Functions_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#         trig_single_precision_negative_kernels.cc 66)
+if(UNIX)
+file(GLOB NEGATIVE_TEST_SRC
+    "trig_single_precision_negative_kernels.cc"
+    "trig_double_precision_negative_kernels.cc"
+    "misc_negative_kernels.cc"
+    "math_remainder_negative_kernels.cc"
+    "math_rounding_negative_kernels.cc"
+    "single_precision_intrinsics_negative_kernels.cc"
+    "double_precision_intrinsics_negative_kernels.cc"
+    "integer_intrinsics_negative_kernels.cc"
+    "math_root_negative_kernels_1Dand2D.cc"
+    "math_root_negative_kernels_3Dand4D.cc"
+    "math_pow_negative_kernels.cc"
+    "math_log_negative_kernels.cc"
+    "math_special_func_kernels.cc"
+    "casting_double_negative_kernels.cc"
+    "casting_float_negative_kernels.cc"
+    "casting_int_negative_kernels.cc"
+    "casting_half2_negative_kernels.cc"
+    "half_precision_math_negative_kernels.cc"
+    "half_precision_arithmetic_negative_kernels.cc"
+    "half_precision_comparison_negative_kernels.cc"
+    "casting_half2int_negative_kernels.cc"
+    "casting_int2half_negative_kernels.cc"
+    "casting_half_float_negative_kernels.cc"
+      )
+
+file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
+#if(HIP_PLATFORM MATCHES "nvidia")
+# set(ERRORS_1 81)
+# set(ERRORS_2 100)
+#elseif(HIP_PLATFORM MATCHES "amd")
+# set(ERRORS_1 76)
+# set(ERRORS_2 168)
+#endif()
 #
+#add_test(NAME Unit_Device_Single_Precision_Trig_Functions_Negative
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
+#         trig_single_precision_negative_kernels.cc 66)
 #add_test(NAME Unit_Device_Double_Precision_Trig_Functions_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         trig_double_precision_negative_kernels.cc 66)
 #add_test(NAME Unit_Device_Misc_Functions_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#         misc_negative_kernels.cc 76)
-#
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
+#         misc_negative_kernels.cc ${ERRORS_1})
 #add_test(NAME Unit_Device_remainder_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#         math_remainder_negative_kernels.cc 68)
-#
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
+#         math_remainder_negative_kernels.cc 67)
 #add_test(NAME Unit_Device_rounding_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         math_rounding_negative_kernels.cc 40)
-#
 #add_test(NAME Unit_Single_Precision_Intrinsics_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         single_precision_intrinsics_negative_kernels.cc 42)
-#
 #add_test(NAME Unit_Double_Precision_Intrinsics_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         double_precision_intrinsics_negative_kernels.cc 18)
-#
 #add_test(NAME Unit_Integer_Intrinsics_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         integer_intrinsics_negative_kernels.cc 20)
 #add_test(NAME Unit_Device_root_1Dand2D_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         math_root_negative_kernels_1Dand2D.cc 68)
-#
 #add_test(NAME Unit_Device_root_3Dand4D_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         math_root_negative_kernels_3Dand4D.cc 56)
 #add_test(NAME Unit_Device_pow_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         math_pow_negative_kernels.cc 76)
 #add_test(NAME Unit_Device_log_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         math_log_negative_kernels.cc 24)
 #add_test(NAME Unit_Device_special_funcs_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         math_special_func_kernels.cc 76)
 #add_test(NAME Unit_Device_casting_double_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         casting_double_negative_kernels.cc 69)
 #add_test(NAME Unit_Device_casting_float_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         casting_float_negative_kernels.cc 54)
 #add_test(NAME Unit_Device_casting_int_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         casting_int_negative_kernels.cc 92)
-#
 #add_test(NAME Unit_Device_casting_half2_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         casting_half2_negative_kernels.cc 53)
 #add_test(NAME Unit_Half_Precision_Math_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         half_precision_math_negative_kernels.cc 60)
 #add_test(NAME Unit_Half_Precision_Arithmetic_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         half_precision_arithmetic_negative_kernels.cc 88)
 #add_test(NAME Unit_Half_Precision_Comparison_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#         half_precision_comparison_negative_kernels.cc 168)
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
+#         half_precision_comparison_negative_kernels.cc ${ERRORS_2})
 #add_test(NAME Unit_Device_casting_half2int_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         casting_half2int_negative_kernels.cc 78)
 #add_test(NAME Unit_Device_casting_int2half_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         casting_int2half_negative_kernels.cc 78)
 #add_test(NAME Unit_Device_casting_half_float_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         casting_half_float_negative_kernels.cc 18)
+endif()
\ No newline at end of file
diff --git a/catch/unit/printf/CMakeLists.txt b/catch/unit/printf/CMakeLists.txt
index 992326b356..a127092a3c 100644
--- a/catch/unit/printf/CMakeLists.txt
+++ b/catch/unit/printf/CMakeLists.txt
@@ -43,11 +43,17 @@ elseif (HIP_PLATFORM MATCHES "nvidia")
                     COMPILE_OPTIONS -std=c++17)
 endif()
 
-# This test fails in PSDB
+if(UNIX)
+file(GLOB NEGATIVE_TEST_SRC
+      printf_negative_kernels.cc)
+
+file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
 #add_test(NAME Unit_Printf_Negative
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         printf_negative_kernels.cc 11)
+endif()
 
 # Standalone exes
 add_executable(printfFlags_exe EXCLUDE_FROM_ALL printfFlags_exe.cc)
diff --git a/catch/unit/syncthreads/CMakeLists.txt b/catch/unit/syncthreads/CMakeLists.txt
index a9660f66bc..778dc11095 100644
--- a/catch/unit/syncthreads/CMakeLists.txt
+++ b/catch/unit/syncthreads/CMakeLists.txt
@@ -38,18 +38,27 @@ hip_add_exe_to_target(NAME SyncthreadsTest
                       LINKER_LIBS hiprtc)
 endif()
 
-# Below tests fail in PSDB
+if(UNIX)
+file(GLOB NEGATIVE_TEST_SRC
+     "__syncthreads_count_negative_kernels.cc"
+     "__syncthreads_and_negative_kernels.cc"
+     "__syncthreads_or_negative_kernels.cc"
+    )
+
+file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
 #add_test(NAME Unit___syncthreads_count_Negative_Parameters
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         __syncthreads_count_negative_kernels.cc 2)
 #
 #add_test(NAME Unit___syncthreads_and_Negative_Parameters
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
 #         __syncthreads_and_negative_kernels.cc 2)
 #
 #add_test(NAME Unit___syncthreads_or_Negative_Parameters
-#         COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#         ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#         __syncthreads_or_negative_kernels.cc 2)
\ No newline at end of file
+#         COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+#         ./src ${HIP_PLATFORM} ${HIP_PATH}
+#         __syncthreads_or_negative_kernels.cc 2)
+endif()
\ No newline at end of file
diff --git a/catch/unit/vector_types/CMakeLists.txt b/catch/unit/vector_types/CMakeLists.txt
index 90d6d27dbd..72a9d9505a 100644
--- a/catch/unit/vector_types/CMakeLists.txt
+++ b/catch/unit/vector_types/CMakeLists.txt
@@ -38,60 +38,77 @@ hip_add_exe_to_target(NAME VectorTypesTest
                       LINKER_LIBS hiprtc)
 endif()
 
-# Below tests fail in PSDB
-#if(HIP_PLATFORM MATCHES "amd")
-#    add_test(NAME Unit_NegateUnsigned_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_negate_unsigned.cc 40)
-#
-#    add_test(NAME Unit_BitwiseFloat_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_bitwise_float.cc 96)
-#
-#    add_test(NAME Unit_BitwiseDouble_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_bitwise_double.cc 96)
-#
-#    add_test(NAME Unit_CalculateAssign1D_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_calculate_assign_with_value_1D.cc 60)
-#
-#    add_test(NAME Unit_CalculateAssign2D_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_calculate_assign_with_value_2D.cc 60)
-#
-#    add_test(NAME Unit_CalculateAssign3D_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_calculate_assign_with_value_3D.cc 60)
-#
-#    add_test(NAME Unit_CalculateAssign4D_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_calculate_assign_with_value_4D.cc 60)
-#
-#    add_test(NAME Unit_CalculateAssignUnsigned1D_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_calculate_assign_with_unsigned_value_1D.cc 60)
-#
-#    add_test(NAME Unit_CalculateAssignUnsigned2D_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_calculate_assign_with_unsigned_value_2D.cc 60)
-#
-#    add_test(NAME Unit_CalculateAssignUnsigned3D_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_calculate_assign_with_unsigned_value_3D.cc 60)
-#
-#    add_test(NAME Unit_CalculateAssignUnsigned4D_Negative_Parameters
-#            COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/../compileAndCaptureOutput.py
-#            ${CMAKE_CURRENT_SOURCE_DIR} ${HIP_PLATFORM} ${HIP_PATH}
-#            negative_calculate_assign_with_unsigned_value_4D.cc 60)
-#endif()
+if(UNIX)
+if(HIP_PLATFORM MATCHES "amd")
+    file(GLOB NEGATIVE_TEST_SRC
+         "negative_negate_unsigned.cc"
+         "negative_bitwise_float.cc"
+         "negative_bitwise_double.cc"
+         "negative_calculate_assign_with_value_1D.cc"
+         "negative_calculate_assign_with_value_2D.cc"
+         "negative_calculate_assign_with_value_3D.cc"
+         "negative_calculate_assign_with_value_4D.cc"
+         "negative_calculate_assign_with_unsigned_value_1D.cc"
+         "negative_calculate_assign_with_unsigned_value_2D.cc"
+         "negative_calculate_assign_with_unsigned_value_3D.cc"
+         "negative_calculate_assign_with_unsigned_value_4D.cc"
+         "negative_macros_common.hh" )
+
+    file(COPY ${NEGATIVE_TEST_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
+    #add_test(NAME Unit_NegateUnsigned_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_negate_unsigned.cc 40)
+
+    #add_test(NAME Unit_BitwiseFloat_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_bitwise_float.cc 96)
+
+    #add_test(NAME Unit_BitwiseDouble_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_bitwise_double.cc 96)
+
+    #add_test(NAME Unit_CalculateAssign1D_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_calculate_assign_with_value_1D.cc 60)
+
+    #add_test(NAME Unit_CalculateAssign2D_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_calculate_assign_with_value_2D.cc 60)
+
+    #add_test(NAME Unit_CalculateAssign3D_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_calculate_assign_with_value_3D.cc 60)
+
+    #add_test(NAME Unit_CalculateAssign4D_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_calculate_assign_with_value_4D.cc 60)
+
+    #add_test(NAME Unit_CalculateAssignUnsigned1D_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_calculate_assign_with_unsigned_value_1D.cc 60)
+
+    #add_test(NAME Unit_CalculateAssignUnsigned2D_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_calculate_assign_with_unsigned_value_2D.cc 60)
+
+    #add_test(NAME Unit_CalculateAssignUnsigned3D_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_calculate_assign_with_unsigned_value_3D.cc 60)
+
+    #add_test(NAME Unit_CalculateAssignUnsigned4D_Negative_Parameters
+    #        COMMAND ${Python3_EXECUTABLE} ../compileAndCaptureOutput.py
+    #        ./src ${HIP_PLATFORM} ${HIP_PATH}
+    #        negative_calculate_assign_with_unsigned_value_4D.cc 60)
+endif()
+endif()