diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
index 5674bbbe39..7a6b4acdad 100644
--- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
+++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
@@ -232,12 +232,6 @@
         "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessor_Positive_RangeValidation",
         "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Positive_RangeValidation",
         "=== SWDEV-435667: Below tests failing randomly in stress test on 01/12/23 ===",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - int",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned int",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned long",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned long long",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - float",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - double",
         "Unit_atomicExch_Positive_Multi_Kernel - int",
         "Unit_atomicExch_Positive_Multi_Kernel - unsigned int",
         "Unit_atomicExch_Positive_Multi_Kernel - unsigned long",
diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows
index fe1617e4b7..32eda36bef 100644
--- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows
+++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows
@@ -280,12 +280,6 @@
         "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessor_Positive_RangeValidation",
         "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Positive_RangeValidation",
         "=== SWDEV-435667: Below tests failing randomly in stress test on 01/12/23 ===",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - int",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned int",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned long",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned long long",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - float",
-        "Unit_atomicExch_Positive_Same_Address_Compile_Time - double",
         "Unit_atomicExch_Positive_Multi_Kernel - int",
         "Unit_atomicExch_Positive_Multi_Kernel - unsigned int",
         "Unit_atomicExch_Positive_Multi_Kernel - unsigned long",
diff --git a/projects/hip-tests/catch/unit/atomics/atomicExch.cc b/projects/hip-tests/catch/unit/atomics/atomicExch.cc
index d296590387..c3b9bfbe15 100644
--- a/projects/hip-tests/catch/unit/atomics/atomicExch.cc
+++ b/projects/hip-tests/catch/unit/atomics/atomicExch.cc
@@ -58,7 +58,9 @@ TEMPLATE_TEST_CASE("Unit_atomicExch_Positive_Same_Address_Compile_Time", "", int
                    unsigned long, unsigned long long, float, double) {
 #endif // HT_NVIDIA
   for (auto current = 0; current < cmd_options.iterations; ++current) {
-    AtomicExchSameAddressTest<TestType, AtomicScopes::device>();
+      DYNAMIC_SECTION("Positive Same Address" << current) {
+         AtomicExchSameAddressTest<TestType, AtomicScopes::device>();
+    }
   }
 }