diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
index 55e06a4902..e8de3dbd15 100644
--- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
+++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
@@ -13,14 +13,10 @@
         "Unit_hipFuncGetAttributes_Positive_Basic",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-244",
         "Unit_hipExtLaunchMultiKernelMultiDevice_Negative_Parameters",
-        "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Negative_Parameters",
-        "Unit_hipModuleOccupancyMaxPotentialBlockSizeWithFlags_Negative_Parameters",
         "Unit_hipMemAdvise_No_Flag_Interference",
         "NOTE: The following 2 tests are disabled due to defect - EXSWHTEC-238",
         "Unit_hipMemRangeGetAttribute_Positive_AccessedBy_Basic",
         "Unit_hipMemRangeGetAttribute_Positive_AccessedBy_Partial_Range",
-        "Disabling test tracked SWDEV-395683",
-        "Unit_hipStreamPerThread_MultiThread",
         "=== Below 2 tests are disable due to defect EXSWHTEC-356 ===",
         "Unit_Device___hisinf2_Accuracy_Positive",
         "Unit_Device___hisnan2_Accuracy_Positive",
@@ -40,8 +36,6 @@
         "=== Below 2 tests are disable due to defect EXSWHTEC-369 ===",
         "Unit_Device_ilogbf_Accuracy_Positive",
         "Unit_Device_ilogb_Accuracy_Positive",
-        "NOTE: The following test is disabled due to defect - EXSWHTEC-245",
-        "Unit_hipMemSetAccess_GrowVMM",
         "=== SWDEV-434171: Below tests took long time to complete in stress test on 17/11/23 ===",
         "Unit_Warp_Shfl_Positive_Basic - int",
         "Unit_Warp_Shfl_Positive_Basic - unsigned int",
@@ -63,13 +57,6 @@
         "Unit_Warp_Shfl_XOR_Positive_Basic - double",
         "Unit_Warp_Shfl_XOR_Positive_Basic - __half",
         "Unit_Warp_Shfl_XOR_Positive_Basic - __half2",
-        "=== SWDEV-434878: Below tests failed in stress test on 24/11/23 ===",
-        "Unit_hipModuleOccupancyMaxPotentialBlockSize_Negative_Parameters",
-        "Unit_hipModuleOccupancyMaxPotentialBlockSize_Positive_RangeValidation",
-        "Unit_hipModuleOccupancyMaxPotentialBlockSizeWithFlags_Positive_RangeValidation",
-        "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessor_Negative_Parameters",
-        "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessor_Positive_RangeValidation",
-        "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Positive_RangeValidation",
         "=== SWDEV-439004: Below tests failing randomly in CQE staging ===",
         "Unit_hipGraphicsMapResources_Negative_Parameters",
         "Unit_hipGraphicsSubResourceGetMappedArray_Negative_Parameters",
@@ -77,13 +64,6 @@
         "Unit_hipGraphicsResourceGetMappedPointer_Negative_Parameters",
         "Unit_hipGraphicsUnmapResources_Negative_Parameters",
         "Unit_hipGraphicsUnregisterResource_Negative_Parameters",
-        "SWDEV-442583: Below tests failing in stress test on 12/01/24 ===",
-        "Unit_hipLaunchCooperativeKernelMultiDevice_Negative_Parameters",
-        "Unit_hipLaunchCooperativeKernelMultiDevice_Negative_MultiKernelSameDevice",
-        "=== Below tests are failing PSDB ===",
-        "Unit_hipLaunchCooperativeKernel_Negative_Parameters",
-        "Unit_hipLaunchKernel_Negative_Parameters",
-        "Unit_hipModuleLaunchCooperativeKernel_Negative_Parameters",
         "SWDEV-446588 - Disable graph multi gpu testcases until graph has support for it",
         "=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/210 ===",
         "Unit_Assert_Positive_Basic_KernelFail",
@@ -558,34 +538,17 @@
         "Unit_Device___hiloint2double_Negative_RTC",
         "SWDEV-447384, SWDEV-447932: These tests fail in gfx1100, gfx1101 & gfx1102",
         "SWDEV-445928: These tests fail in PSDB stress test on 09/02/2024",
-        "Unit_hipDestroySurfaceObject_Negative_Parameters",
         "Unit_Device___float2half_rd_Accuracy_Limited_Positive",
         "Unit_Device___float2half_ru_Accuracy_Limited_Positive",
         "Unit_Device___float2half_rz_Accuracy_Limited_Positive",
         "Unit_hipGraphInstantiateWithFlags_StreamCaptureDeviceContextChg",
-        "=== SWDEV-457316 Below tests are disabled temporarily to avoid combined PSDB ===",
-        "Unit_hipGraphAddMemFreeNode_Negative_NotSupported",
         "=== SWDEV-511679 : Below tests fail in stress test ===",
         "Unit_hipIpcOpenMemHandle_Negative_Open_In_Two_Contexts_Same_Device",
         "Unit_hipIpcCloseMemHandle_Positive_Reference_Counting",
-        "=== SWDEV-517063 Below tests are temporarily disabled due to PSDB failure",
-        "Unit_hipGraphInstantiateWithFlags_AutoFreeOnLaunchMultiProcess",
         "=== SWDEV-457316 Below test is skipped due ref count logic (Discussed with German) ===",
         "Unit_hipGraphAddMemAllocNode_Negative_Free_Alloc_Memory_Again",
-        "=== SWDEV-530762 : This test fails in Linux PSDB ===",
-        "Unit_hipDeviceGetGraphMemAttribute_Positive_DoubleMemory",
-	    "=== SWDEV-538600 : This test fails in Linux PSDB ===",
-	    "Unit_hipMemPoolMaxAlloc",
-	    "Unit_hipStreamPerThread_ChildProc",
-        "=== SWDEV-536226 : Below three tests were disabled due to hang issue ===",
-        "Unit_hipGetLastError_KernelFailure_ValidAndInvalidOperations",
-        "Unit_hipGetLastError_KernelFailure_TwoDevices",
-        "Unit_hipGetLastError_KernelFailure_TwoStreams",
         "=== Enable the below test when multi-device graph launches are fully supported ===",
         "Unit_hipGraphInstantiateWithFlags_DependencyGraphDeviceCtxtChg",
-        "=== SWDEV-556658 multiple test failures ===",
-        "Unit_hipGraphExecMemcpyNodeSetParams_Positive_Basic",
-        "Unit_hipGraph_PerfCheck_hipGraphExecChildGraphNodeSetParams",
         "=== SWDEV-553920 disabled until multi device graph issues are resolved ===",
         "Unit_hipGraphUpload_Functional_multidevice_test",
     #endif
diff --git a/projects/hip-tests/catch/unit/executionControl/hipLaunchCooperativeKernelMultiDevice.cc b/projects/hip-tests/catch/unit/executionControl/hipLaunchCooperativeKernelMultiDevice.cc
index f8a0b9b1da..e369a196b9 100644
--- a/projects/hip-tests/catch/unit/executionControl/hipLaunchCooperativeKernelMultiDevice.cc
+++ b/projects/hip-tests/catch/unit/executionControl/hipLaunchCooperativeKernelMultiDevice.cc
@@ -93,8 +93,13 @@ TEST_CASE("Unit_hipLaunchCooperativeKernelMultiDevice_Negative_Parameters",
   }
 
   SECTION("numDevices > device count") {
+#if HT_AMD
+    HIP_CHECK_ERROR(hipLaunchCooperativeKernelMultiDevice(params_list.data(), device_count + 1, 0u),
+                    hipErrorInvalidDevice);
+#else
     HIP_CHECK_ERROR(hipLaunchCooperativeKernelMultiDevice(params_list.data(), device_count + 1, 0u),
                     hipErrorInvalidValue);
+#endif
   }
 
   SECTION("invalid flags") {
@@ -158,4 +163,4 @@ TEST_CASE("Unit_hipLaunchCooperativeKernelMultiDevice_Negative_MultiKernelSameDe
   for (const auto params : params_list) {
     HIP_CHECK(hipStreamDestroy(params.stream));
   }
-}
\ No newline at end of file
+}