diff --git a/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp b/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
index 2ac66564df..29b48a1f31 100644
--- a/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
@@ -248,7 +248,7 @@ namespace UnitTest
 
         AZ_TEST_START_TRACE_SUPPRESSION;
         auto* mockCatalog = new ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>(AzFramework::PlatformId::ANDROID_ID);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
         AZStd::unique_ptr< ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>> catalogHolder;
         catalogHolder.reset(mockCatalog);
 
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
index 81d44d7426..b0fd167cc0 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
@@ -15,7 +15,7 @@ namespace UnitTest
     {
         AZ_TEST_START_TRACE_SUPPRESSION;
         EXPECT_FALSE(m_prefabSystemComponent->InstantiatePrefab(AzToolsFramework::Prefab::InvalidTemplateId));
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
     }
 
     TEST_F(PrefabInstantiateTest, PrefabInstantiate_NoNestingTemplate_InstantiateSucceeds)
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp
index db7640916d..bf47e57206 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp
@@ -71,7 +71,7 @@ namespace UnitTest
         
         AZ_TEST_START_TRACE_SUPPRESSION;
         templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(3);
         templateData.m_isLoadedWithErrors = true;
 
         PrefabTestDataUtils::ValidateTemplateLoad(templateData);
@@ -119,7 +119,7 @@ namespace UnitTest
         // Load target and source Templates and get their Ids.
         AZ_TEST_START_TRACE_SUPPRESSION;
         targetTemplateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(targetTemplateData.m_filePath);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(4);
         sourceTemplateData.m_id = m_prefabSystemComponent->GetTemplateIdFromFilePath(sourceTemplateData.m_filePath);
 
         // Because of cyclical dependency, the two Templates should be loaded with errors.
@@ -150,7 +150,7 @@ namespace UnitTest
 
         AZ_TEST_START_TRACE_SUPPRESSION;
         templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(2);
 
         PrefabTestDataUtils::ValidateTemplateLoad(templateData);
     }
@@ -169,7 +169,7 @@ namespace UnitTest
 
         AZ_TEST_START_TRACE_SUPPRESSION;
         templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(2);
 
         PrefabTestDataUtils::ValidateTemplateLoad(templateData);
     }
@@ -193,7 +193,7 @@ namespace UnitTest
 
         AZ_TEST_START_TRACE_SUPPRESSION;
         templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(3);
 
         PrefabTestDataUtils::ValidateTemplateLoad(templateData);
     }
@@ -292,7 +292,7 @@ namespace UnitTest
 
         AZ_TEST_START_TRACE_SUPPRESSION;
         TemplateId templateId = m_prefabLoaderInterface->LoadTemplateFromFile(pathToCorruptedPrefab);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
 
         EXPECT_EQ(templateId, AzToolsFramework::Prefab::InvalidTemplateId);
     }
@@ -304,7 +304,7 @@ namespace UnitTest
         AZ_TEST_START_TRACE_SUPPRESSION;
         EXPECT_EQ(m_prefabLoaderInterface->LoadTemplateFromString(emptyPrefabDomStr, "|?<>"), AzToolsFramework::Prefab::InvalidTemplateId);
         EXPECT_EQ(m_prefabLoaderInterface->LoadTemplateFromString(emptyPrefabDomStr, "notAFile/"), AzToolsFramework::Prefab::InvalidTemplateId);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(2);
     }
 
     TEST_F(PrefabLoadTemplateTest, LoadTemplate_LoadFromString_LoadsEmptyPrefab)
@@ -336,7 +336,7 @@ namespace UnitTest
         templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromString(
             selfDependentPrefabStr,
             templateData.m_filePath);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(3);
 
         templateData.m_isLoadedWithErrors = true;
 
@@ -348,7 +348,7 @@ namespace UnitTest
         AZStd::string corruptPrefab = "{ Corrupted PrefabDom";
         AZ_TEST_START_TRACE_SUPPRESSION;
         TemplateId templateId = m_prefabLoaderInterface->LoadTemplateFromString(corruptPrefab);
-        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
+        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
         EXPECT_EQ(templateId, AzToolsFramework::Prefab::InvalidTemplateId);
     }
 }
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
index 413e3ea0b4..6e836e4d44 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
@@ -169,14 +169,10 @@ namespace UnitTest
                 if (expectedNestedInstanceDomInstances->get().IsArray())
                 {
                     ASSERT_TRUE(actualNestedInstanceDomInstances->get().IsArray());
-                    const size_t arraySize = expectedNestedInstanceDomInstances->get().GetArray().Size();
-                    for(size_t i = 0; i < arraySize; ++i)
-                    {
-                        ComparePrefabDoms(
-                            expectedNestedInstanceDomInstances->get().GetArray()[i],
-                            actualNestedInstanceDomInstances->get().GetArray()[i],
-                            shouldCompareLinkIds, shouldCompareContainerEntities);
-                    }
+                    const size_t expectedArraySize = expectedNestedInstanceDomInstances->get().GetArray().Size();
+                    EXPECT_EQ(0, expectedArraySize);
+                    const size_t actualArraySize = actualNestedInstanceDomInstances->get().GetArray().Size();
+                    EXPECT_EQ(0, actualArraySize);
                 }
                 if (expectedNestedInstanceDomInstances->get().IsObject())
                 {