diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux
index 16340e45f..0a7025012 100644
--- a/catch/hipTestMain/config/config_amd_linux
+++ b/catch/hipTestMain/config/config_amd_linux
@@ -702,27 +702,9 @@
         "Unit_hipGraphInstantiateWithFlags_StreamCaptureDeviceContextChg",
         "=== SWDEV-457316 Below tests are disabled temporarily to avoid combined PSDB ===",
         "Unit_hipGraphAddMemFreeNode_Negative_NotSupported",
-        "=== These tests fail on linux PSDB 21/11/24 ===",
-        "Unit_atomicMax_Positive_Multi_Kernel_Same_Address - double",
-        "Unit_atomicMax_Positive_Multi_Kernel_Same_Address - float",
-        "Unit_atomicMin_Positive_Multi_Kernel_Same_Address - double",
-        "Unit_atomicMin_Positive_Multi_Kernel_Same_Address - float",
-        "Unit_safeAtomicMax_Positive_Multi_Kernel_Same_Address - double",
-        "Unit_safeAtomicMax_Positive_Multi_Kernel_Same_Address - float",
-        "Unit_safeAtomicMin_Positive_Multi_Kernel_Same_Address - double",
-        "Unit_safeAtomicMin_Positive_Multi_Kernel_Same_Address - float",
-        "Unit_unsafeAtomicMax_Positive_Multi_Kernel_Same_Address - double",
-        "Unit_unsafeAtomicMax_Positive_Multi_Kernel_Same_Address - float",
-        "Unit_unsafeAtomicMin_Positive_Multi_Kernel_Same_Address - double",
-        "Unit_unsafeAtomicMin_Positive_Multi_Kernel_Same_Address - float",
         "=== SWDEV-475482 - Disable tests to merge clr change ===",
         "Unit_hipCreateTextureObject_LinearResource",
         "Unit_hipCreateTextureObject_Pitch2DResource",
-        "=== SWDEV-454316 : Below tests fail in stress test ===",
-        "Unit_atomicMin_system_Positive_Peer_GPUs_Same_Address - float",
-        "Unit_atomicMin_system_Positive_Peer_GPUs_Same_Address - double",
-        "Unit_atomicMax_system_Positive_Peer_GPUs_Same_Address - float",
-        "Unit_atomicMax_system_Positive_Peer_GPUs_Same_Address - double",
         "=== SWDEV-511679 : Below tests fail in stress test ===",
         "Unit_hipIpcOpenMemHandle_Negative_Open_In_Two_Contexts_Same_Device",
         "Unit_hipIpcCloseMemHandle_Positive_Reference_Counting",
@@ -775,7 +757,6 @@
         "Unit_Device___float2half_rd_SmallVals_Sanity_Positive",
         "Unit_Device___float2half_ru_SmallVals_Sanity_Positive",
         "Unit_Device___float2half_rz_SmallVals_Sanity_Positive",
-        "Unit_safeAtomicMin_Positive_SameAddress - float",
     #endif
     #if defined gfx1030
         "=== SWDEV-445961: These tests hang in PSDB stress test on 09/02/2024 ===",
diff --git a/catch/hipTestMain/config/config_amd_windows b/catch/hipTestMain/config/config_amd_windows
index 91a6107dc..848b630d4 100644
--- a/catch/hipTestMain/config/config_amd_windows
+++ b/catch/hipTestMain/config/config_amd_windows
@@ -621,7 +621,6 @@
         "Unit_hipMemset2DAsync_capturehipMemset2DAsync",
         "Unit_hipOccupancyMaxPotBlkSizeVariableSMemWithFlags_Functional",
         "Unit_hipDynamicShared",
-        "Unit___hip_atomic_fetch_min_Positive_Workgroup_Scattered_Addresses - double",
         "Unit_atomicExch_Positive - int",
         "Unit_atomicExch_Positive - unsigned int",
         "Unit_atomicExch_Positive - unsigned long",
@@ -957,12 +956,6 @@
         "Unit_Coalesced_Group_Tiled_Partition_Shfl_Down_Positive_Basic - unsigned long long",
         "Unit_Coalesced_Group_Tiled_Partition_Shfl_Down_Positive_Basic - float",
         "Unit_Coalesced_Group_Tiled_Partition_Shfl_Down_Positive_Basic - double",
-        "=== SWDEV-454316 : Below tests fail in stress test ===",
-        "Unit_atomicMin_system_Positive_Peer_GPUs_Same_Address - float",
-        "Unit_atomicMin_system_Positive_Peer_GPUs_Same_Address - double",
-        "Unit_safeAtomicMax_Positive_Multi_Kernel_Same_Address - float",
-        "Unit_atomicMax_system_Positive_Peer_GPUs_Same_Address - float",
-        "Unit_atomicMax_system_Positive_Peer_GPUs_Same_Address - double",
         "=== SWDEV-475482 - Disable tests to merge clr change",
         "Unit_hipCreateTextureObject_LinearResource",
         "Unit_hipCreateTextureObject_Pitch2DResource",